Add Disambiguator extension

Change-Id: I342d718980dec04d626acbf64c0de833070d9ea7
Merge "Add Disambiguator extension" into wmf/1.22wmf5