CLOUDIFY-2222 fixed unit tests.
Merge remote-tracking branch 'origin/feature/CLOUDIFY-2222-manager-rest' into feature/CLOUDIFY-2222-manager-rest