Merge branch 'image-v2-v2' into dt-test
Merge branch 'identity-ec2-tests' into dt-test