master and tenant google analytics
fix typo
review followup
renamed parameter
updated tests
Merge branch 'googleanalytics' of https://github.com/sathomas/Hilary into googleanalytics
GA follow-up