Moved Registry + _IdMapping to utils
Merge remote-tracking branch 'origin/frb' into resource-manager
Merge branch 'resource-manager' into frb