Update Campaigns to master

Change-Id: I89e9e75a1fb577fe20f54a9dd62e9abf5edb732e
Merge "Update Campaigns to master" into wmf/1.22wmf8