CRM-13964-qa : includes 1st QA cycle fixes mentioned in issue comment
CRM-13964-qa : upgrade message template adding
CRM-13964-qa
CRM-13964-qa : some more fixes / additions done
Merge pull request #2602 from pratik-joshi/CRM-13964-qa

Crm 13964 QA fixes