Merge "k8s OS cloud provider net options support" into release/2019.2.0