analytics: fix more TODOs with latest code from analytics-as-osgi-plugin-support

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>