Clang 6 updates

Just some minor fixes.

Change-Id: I000c456e51c62220d7a5fed8100cfc6c13ef9551
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
8 files changed