LT-15568, LT-15797: Fix Minor Entries in Root-based view

- Use 'Referenced Complex Forms' instead of Subentries and Others
  in the same places as in the old config
- Roll back code to convert Referenced Complex Forms to Subentries

Change-Id: Id6d87bde1baf7b2a79c879a56b947c6efc16bd1e