Automatic merge from submit-queue

Adds --network-plugin-dir argument to hack/local-up-cluster.sh

CNI Network Plugin developers who want to use hack/local-up-cluster.sh need to specify the --network-plugin-dir option to kubelet.