Fix errant underscores

Change-Id: I71b8c8df14b85e3042220e3593a9732ee6cefe15
Merge branch 'image-set-fix' into dt-test
Merge branch 'oslo-clean' 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