Apply post-1.18.3 fixes, bump version to 1.18.4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7 files changed