Merge "Run deployment tests on oslo-templates"