code clean / fixes CRM-14429

----------------------------------------
* CRM-14429: Contact import fails silently on lookup of custom field option values by label
  https://issues.civicrm.org/jira/browse/CRM-14429
Merge pull request #2902 from kurund/CRM-14429

code clean / fixes CRM-14429