Fix memory leak issue discovered by Coverity
EUCA-8603
Merge branch 'dev/chuck/3.4.1.c' into maint/3.4/testing