Merge "Fix tempest router timestamp test when HA enabled"