fixed integration test, not reaching ACTIVE state
Merging of my fix for the integration test 1096.
Merge branch 'bjornintegrationfix' into Testing_Release_0.5