[WIP] FlexibleEntityBundle / CatalogBundle cleanup

| Q                   | A
| ------------------- | ---
| Bug fix?            |
| New feature?        |
| BC breaks?          |
| Tests pass?         |
| Scenarios pass?     |
| Checkstyle issues?  |
| Changelog updated?  |
| Fixed tickets       |
| Doc PR              |