BFEBS run instance failure. RollbackException: Error while committing the transaction
Fixes EUCA-4271
clean up
Merge branch 'dev/kedwards/EUCA-4271' into maint/3.2/testing