Sync lockutils from oslo

Change-Id: I906810cd8b109dd2b88e76c5aec9536c62913068
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>