Merge "Fix creds still used by vrouter"