CLOUDIFY-1784
added retry tests
Merge remote-tracking branch 'origin/master'