CRM-14109 add more nuance to cache key

Conflicts:
	CRM/Contact/BAO/Group.php

----------------------------------------
* CRM-14109: Permissioned users being blocked from viewing disabled (but otherwise 'permissable' groups)
  http://issues.civicrm.org/jira/browse/CRM-14109
CRM-14109 remove unreliable permission check, per comments this is now redundant - it also fails to return disabled groups - which is coded pretty deep

----------------------------------------
* CRM-14109: Permissioned users being blocked from viewing disabled (but otherwise 'permissable' groups)
  http://issues.civicrm.org/jira/browse/CRM-14109
Whitespace re-alignment from previous commit