Merge "Fix fatal due to lock name mismatch in Maintenance::unlockSearchindex"