Merge "Fix default-global-vrouter-config name"