[OS-BUILD PATCHv13 10/11] Simplify job rules