Rename Storage.HardState back to InitialState and include ConfState.

This fixes integration/migration_test.go (and highlights the fact that
we need some more raft-level testing of restoring from snapshots).