backport of 4.4 return property handling
Changes to group contact cache behaviour that worked on AUG to fix performance bottleneck
CRM-13296 fix token hook