Coverity: 1198196
Coverity issue 1197642
Coverity: 712599
Coverity: 711764
Coverity 711857
Coverity: 1230781. Oops! Fixing my previous fix.
Fix coverity errors CID 1230781
and 1230782,
double attempt to fix coverity error
Fixed error with previous merge that prevented compilation.
Reorganized some stuff in CMakeLists.txt
Coverity: 711707
Coverity: 711940
Coverity: 712596
conflict resolution
switch