typo
remove unnecessary <cfdump>
only store timeout as part of the mail task when this was defined with tag cfmail
Merge remote-tracking branch 'origin/4.1' into 4.1
added testcase for ticket 2698