XAP 9.6 support, new package structure , support for persisting SpaceDescriptor