CLOUDIFY-1470, modified all cloud groovy files to match the new cloud syntax
Fixed test
normalize settings.xml