Bug 20912: (QA follow-up) Move Fees to Charges::