Analytics: add workaround for the token collision.
Merge pull request #631 from forkcms/workaround-google-token-collision

Analytics: add workaround for the token collision.
Preparing for release