Added optional wiki_name setting

Change-Id: I933abc9670f27feed52b0596aed3fe32a7b9c606
Merge "Added optional wiki_name setting" into production