Merge "Clean up lock name in lock messages in DatabaseMysqlBase"