Cherry pick from trivial-fixes to reduce the size of the merge
Merge pull request #520 from peternewman/e1.37-2

Cherry pick from trivial-fixes to reduce the size of the merge
More minor cherry picked whitespace cleanup
Cherry pick some more tweaks to reduce the change further.
Tweak the logging level
(cherry picked from commit 0be487b720631429a5150984841ebe0af5d5cd14)
Fix the build
(cherry picked from commit f64e86aae11da04b66c81856acc34784bcc71d54)
Merge pull request #521 from peternewman/e1.37-2

Cherry pick some more tweaks to reduce the change further.
Resync with trunk