analytics: fix two bugs introduced during the code review

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge branch 'master' of github.com:killbill/killbill