cpplint fixes
Merge branch 'fix/cpplint-fixes' into 'master'

Fix a few cpplint errors

Merged-on: https://www.assembla.com/code/OpenSurgSim/git/merge_requests/1127083