Ec2 and RHOS catalog item

Combined Ec2 and RHOS catalog item tests . Ec2 test pass only for ec2west provider.