CLOUDIFY-1261 fix groovy and properties file. corrected tests