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-1203: OOP unit config creation
19 Feb 13 Alex 15698
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.