* refactor CatalogEntityRegistry from common to main Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * test fix Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>