Fix memory leak reported by Coverity.
EUCA-8837
Merge branch 'testing' into dev/chuck/COVERITY41
Fix memory leak issue reported by Coverity
EUCA-9885