Merge "Simplify job scheduler service locking." into nyc-dev