Fix Catalyst editions.

Added missing (and required) new modules to Catalyst Base.

Change-Id: Idc9e5891f13509f29b29a661f1766bf712f0c731
Merge topic 'lookup_table_cleanup' into next

16f06f7e Fix Catalyst editions.