Merge "Add enhanced ELP RLOC processing in Map-Replies"