Revert "maxResults added to CatalogService"

This reverts commit 9ba290babd08dbf691bbbd9c5d89f96495aeae34.
rename mock services
set context root name
Merge origin/master