Automatic merge from submit-queue

Don't overwrite FLANNEL_OTHER_NET_CONFIG in ubuntu config

Make it easier to pass options to flannel through environment variables.