Apply post-1.17.3 fixes, bump version to 1.17.4

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