Fixup on some modules for release

There may be more coming, but if not, this should cover
this week's minor style changes.
Merge up from upstream/master
More fix-up on the DNS amplication scanner
Land #3164, release fixes