Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev