Merge "Bug 6297: Change subscriber's RLOC selection algo"