CRM_Core_BAO_Block - Fix API regressions
Merge pull request #1323 from totten/master-handleprimary

CRM_Core_BAO_Block - Fix API regressions