Analytics additions
Merge pull request #5953 from danmcp/master

Merged by openshift-bot