Ensure we can read sites and their catalogs without an OEMIVF
Move bean definitions to XML instead of @Component