testing for trie rollback
Merge branch 'master' of https://github.com/ethereum/ethereumj