Merge "Fix ODL itr rloc for supporting LISP CP over admin"