Fixes #233, Fixes #236

Catalog now supports per tenant catalog.

The per tenant catalogs are cached using EhCache -- the current commit does not deal with cache invalidation, see #235
Fixes log message (Pierre's code review)