cppcheck 1.63 fixes for RHEL6
Merge pull request #119 from tribal-tec/master

cppcheck 1.63 fixes for RHEL6