Merge "Make the non ha router usage explicit in a dvr test"