Update GuidedTour to master

Change-Id: I839f8c5f703e1608a4044485749449ee10fc1649
Update EventLogging to master

Change-Id: Ib653dde9a5fe438fb413ad051c9ea4a0ed3319ca
Merge changes Ib653dde9,I839f8c5f into wmf/1.22wmf7

* changes:
  Update EventLogging to master
  Update GuidedTour to master