Merge "Fix creds used by vrouter"