transactional emails integration test enhanced to check html merge
Merge remote-tracking branch 'origin/master'