Closes #3293. Removes `database.MerkleState` as it was a shim around `merkle.State`.

Changelog: refactor