Small refactors to handle Kryo serialization
Merge branch 'master' of github.com:cbcrg/jdk7-dxfs