Fixing test runs by renaming conflicting files in SalesforceCommonUtils