LPS-35026 The class reload testing is needed after all.
LPS-30322 Unit test, part 5
LPS-30322 SF
LPS-34947 JSON Serializer error when accessing Asset Categories Admin portlet
LPS-34947 Source formatting
LPS-34947 Sort - keep entity name first
LPS-30240 Improve test to avoid outputing exception stack
LPS-30322 Unit test, part 6
LPS-30322 SF
LPS-35051 - Paths
LPS-35051 - Actions
LPS-35051 - Macros
LPS-35051 - Tests
LPS-35051 - Tests
LPS-34182 Refactor content reference export

Conflicts:
	portal-service/src/com/liferay/portal/kernel/lar/ExportImportUtil.java
LPS-34825 Integration test for content reference export/import
LPS-34825 SF
LPS-30240 SF
LPS-34013 Upgrade "build-alloy" task to handle Alloy 2.0 folder structure and bootstrap.css
LPS-34023 Updating Alloy loader modules