Last round of warning fixes.
Merge pull request #2712 from ktf/fix-last-warnings-gcc490

Gcc 4.9.0 -- Warning fixes.