Fix Coverity issue CID-13325
Merge branch 'testing' into dev/chuck/EUCA-10056
Fix coverity issue CID-11997 and CID-13326