Fixes so we skip lock file generation for lock file maintenance branches only if it *doesn’t* need rebasing. Helps #1655