Merge "Fix kubernetes_contrail_network_controller parameter."