Merge branch 'fix-underscore' into dt-test
Merge branch 'image-set-fix' into dt-test
Merge branch 'neutron-take-2' into dt-test
Merge branch 'no-print' into dt-test
Merge branch 'image-v2-v2' into dt-test
Merge branch 'identity-ec2-tests' into dt-test