Merge "Don't count proxied jobs toward scheduling limit." into rvc-dev