Even more clang fixes.
Fix clang errors / warnings.

- These have been introduced recently. C++14 cannot come early enough.
Merge pull request #5674 from ktf/small-subset-clang-fixes

Backport a few clang fixes