CRM-14639 - replacing PR 3164 with fixes to grant statuses.

----------------------------------------
* CRM-14639:
  https://issues.civicrm.org/jira/browse/CRM-14639