Pushed just removing space.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
Merge pull request #469 from anilgooru/dev-branch

Bugs fixes for 6.3 patch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2
Text changes for email template implemented.
Merge pull request #471 from ssushma/dev-branch

Text changes for email template implemented.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2