Use $this->msg instead of wfMessage

Change-Id: I35f0bd07e82465aa845b479345be3399daf03d91
Merge "Use $this->msg instead of wfMessage"