Also, update the locations that we're told to hieraedit. Change-Id: I41824ff9dc52b3e70a5e55ae71ef49f29511e8e3