Merge "Update openstack/common/lockutils"