Fix for CHAIN-4 - Update servlet implementation classes to be aware of CatalogFactory - thanks to Joe Germuska
Changed paths: