CRM-12778 Additional bug fixes

----------------------------------------
* CRM-12778: Expose grants to the front-end
  https://issues.civicrm.org/jira/browse/CRM-12778