CLOUDIFY-2270
Test committed, reviewed by Kobi.