Cleanup inconsistent labelling - 'State/Province' vs 'State / Province'
CRM-15140 - tweak cache of GET variable to be more accurate
Merge pull request #160 from colemanw/7.x-4.5

CRM-15140 - tweak cache of GET variable to be more accurate