CLOUDIFY-2287
 XAP9x test committed, reviewed by Kobi.