Fix invalid free() issue
EUCA-6166
Merge branch 'dev/chuck/standby' into testing