Merge "Mention the lock name in DatabaseMysqlBase lock() errors"