Modified ec2 to support common image mgmt function names and ec2 test cases