Merge "Add support for upgrading ec2-api"