Merge "Sync fixtures from oslo and use LockFixture"