Merge "Fix vpn scenario test to work with DVR" into mcp/epoxy