reset to pre Kryo Registrator patch
Merge branch 'master' of https://github.com/npanj/spark