Updates include changes for Openfire Session API, plus changes needed to
upgrade to Hazelcast 3.3.1; also some core housekeeping (NPE)