CLOUDIFY-1335 added ec2-location aware dep to pom and fixed test