fix ec2 instances
Merge branch 'master' of github.com:rightscale/self-service-plugins