MessageTemplate changes
Merge remote-tracking branch 'upstream/master'
'MessageTemplateChanges'
selfcareChanges
Merge pull request #105 from LAshokReddy556/master

MessageTemplate changes