Merge "Revert "Make job registration with labels optional""