Fix issue where instance is not properly saved resulting in error
messages
EUCA-10049
Merge branch 'dev/chuck/EUCA-10049' into testing