Merge "Fix OVS startup issue for Ubuntu 16.04"