Merge "Accept non-EA jobs while user is locked." into nyc-dev