Avoid NPEs due to unpersistence order uncertainty [1483]

I can provide more detail if needed - you guys have probably seen similar things. The root of the problem is order of persisted objects in bundles can vary, and this sometimes causes problems during unpersistence if assumptions are made about order of instantiation.