Further wikinotifier updates for havana

Change-Id: I756a8f0ff314892fb456725ff20bb7f56f799f03
Merge "Further wikinotifier updates for havana" into production