CLOUDIFY-1229
moved initElasticMachineProvisioningCloudifyAdapter from before class to before method
Merge remote-tracking branch 'origin/master'