CRM-12595 fix formatting in CRM/Utils files