Merge of "in-portal/branches/5.2.x@16388" to "in-portal/branches/5.3.x@16391". Conflicts:
12 Nov 16 alex 16395
Fixes INP-1501 - Replace "emailevents" with "email-template" in 5.3.x upgrade script Differential Revision: http://qa.in-portal.org/D153
23 Jan 16 alex 16324
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.