CRM-2180: Magento import: failed queries with empty contact phone
Merge branch 'master' into bug/CRM-2180
CRM-2180: Magento import: failed queries with empty contact phone
   - code style fixes
Merge pull request #1273 from laboro/bug/CRM-2180

CRM-2180: Magento import: failed queries with empty contact phone