Update from oslo-incubator master
Merge pull request #1 from malor/update-from-master

Update oslo.db from oslo-incubator's master