Fix cppcheck warnings with 1.63 on RHEL6, speedup execution with CMake subtree update
Merge pull request #334 from tribal-tec/master

Fix cppcheck warnings with 1.63 on RHEL6, speedup execution with CMake subtree