Upstream smaller fixes from 42ity NUT#587

Merged

aquette merged 2 commits intonetworkupstools:masterfrom

jimklimov:bump-upstream-master

Aug 14, 2018

Commits on Aug 8, 2018

gen-snmp-subdriver.sh : replace multiline "echo" with questional tabbing by a single-string "printf"
jimklimov
committed
docs/man/Makefile.am : fix merge error that broke manpage packaging
jimklimov
committed