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-1499 - Don't use auto-loader for inclusion of ClassMapBuilder class from kFactory Differential Revision: http://qa.in-portal.org/D151
23 Jan 16 Alex 16326
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.