Merge changes Ie349c56d,I5d5344cd

* changes:
  Allow for RRO internal referencing
  Idmap format changes for bidirectional lookup