Clean up keystone db workarounds
Merge branch 'keystone-workarounds' into dt-test