Fix #210 "Inconsistent validity key calculation in presence of storage key perfix"
Update XStream, works with java 8