This PR fixes #7824, which crashed when applying a plan file. The bug is that while a map which has come from the HCL parser reifies as a []map[string]interface{}, the variable saved in the plan file was not. We now cover both cases. Fixes #7824.