Merge pull request #5147 from danmcp/master

Merged by openshift-bot
Split user errors and internal errors for analytics