Merge "Add compute feature enabled flag for the ec2 api"