Merge branch 'oslo-clean' into dt-test