oo-admin-ctl-usage: Process billing and non-billing usage records separately
Merge pull request #3151 from pravisankar/dev/ravi/ctl-usage-fixes

Merged by openshift-bot