Merge "Tests for SMR + RTR with disjoint locators"