Merge "Fix keepalived vip interface mapping"