Merge of "in-portal/branches/5.2.x@16513" to "in-portal/branches/5.3.x@16503". Conflicts:
20 Jan 17 alex 16519
Fixes INP-1505 - Restore e-mail template translation sync code removed during merge Differential Revision: http://qa.in-portal.org/D156
23 Jan 16 alex 16323
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.