core/state/snapshot: port changes from 29995#30040

karalabe merged 2 commits into

ethereum:masterethereum/go-ethereum:masterfrom

rjl493456442:snapshot-fixes-2rjl493456442/go-ethereum:snapshot-fixes-2Copy head branch name to clipboard