Merge branch 'volume-keystone' into dt-test