Merge "CTS test for NETWORK_TYPE_METERED job constraint" into oc-dev