Add missing plugin specific methids for Payment and Payment Methods.
catalog: trivial cleanups in DefaultCatalogService

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge remote-tracking branch 'origin/analytics-as-osgi-plugin-support' into analytics-as-osgi-plugin