Bug 833318 - Replacing Cost Control uses by Usage
Merge pull request #8020 from lodr/bug-833318-renaming-cc-to-usage

Bug 833318 - Replacing Cost Control uses by Usage
Cause r+