i118814 - Allow set connection timeout in Mail API
i118814 - Allow set connection timeout in Mail API

Conflicts:
	scripting/source/pyprov/mailmerge.py

Change-Id: I7a3eb3b29f41eed154abd45e1aa5be824983f5de

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