Remove trailing spaces from image module
Update ec2 with new operations
Merge branch 'ec2-updates' into develop

* ec2-updates:
  Update ec2 with new operations
  Remove trailing spaces from image module