i118736 - i118787 : fix XMailMessage implementation in mailmerge.py
i118736 - i118787 : fix XMailMessage implementation in mailmerge.py

(cherry picked from commit 4166969f3b8ed05e91c10a724ce7bd39074012a1)

Conflicts:
	scripting/source/pyprov/mailmerge.py

Change-Id: I794735f02db1efe04b323fed9db5458242e5c16a

JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core