Merge "Revert "Skip scenario tests if HA router will not be active""