Fix importing InstanceInfoCache during register_all()

Related to blueprint unified-object-model

Change-Id: Ib5edd0d0af46d9ba9d0fcaa14c9601ad75b8d50d
Merge "Fix importing InstanceInfoCache during register_all()"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp