separate scaling and storage tracking events
Merge pull request #5184 from danmcp/master

Merged by openshift-bot