Merging from 5.2.x to 5.3.x
Conflicts:
19 Oct Alex 16800
Merge of "in-portal/branches/5.2.x@16189" to "in-portal/branches/5.3.x@16188".
19 May 15 Alex 16195
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.