CRM_Core_SelectValues - Fix bad code / warnings which break test
Merge pull request #2710 from totten/master-selectvalue-cleanup

CRM_Core_SelectValues - Fix bad code / warnings which break test