Update EC2Cloud.java

Merged changes for EC2Cloud.java, combining our changes and upstream changes