LPS-44052 Fix
LPS-41382 Enable selection of global structures when editing a template
LPS-40772 - No next/prev month icons in calendar control
LPS-40772 - Source formatting
Merge branch '6.2.1-ga2-juangon' of http://github.com/juangon/liferay-portal into 6.2.1-ga2-juangon
LPS-45736 Use proper groupId for looking up the imported file entry
LPS-45736 Fix test
LPS-45473 Importing displayStyleGroupId can only match with source company group id
Revert "LPS-44232 Fix cherry-pick"

This reverts commit 719d6a5dabd0799c8aedf57806a4e1e6998e8aa6.
Revert "LPS-44232 SF"

This reverts commit 899030279de7b2de8ebfa1354edb14eed6f49495.
Revert "LPS-44232 SF"

This reverts commit b93016935c6de1afd16238a94bf1ac73292bf8fd.
Revert "LPS-44232 SF - follow the pattern to get variables only as they used"

This reverts commit 27b3155d70f7fa48839e0d2548342ded2bcd753a.
Revert "LPS-44232 SF"

This reverts commit 78f5902f7dda72190432b680c687341676ce69db.
Revert "LPS-44232 Although we have to map the groupIds we can apply some performance improvement - align comment as well"

This reverts commit 461ab546972408b2c2c462aa1591273df0c53534.
Revert "LPS-44232 Source formatting"

This reverts commit 0f13b2969a9621348f6487ee95e2286621a7133c.
Revert "LPS-44232 Fix broken tests"

This reverts commit 8b8451831257a3852617893e5b91a57a51054c1b.
Revert "LPS-44232 Since every layout prototype defines its own group we have to change the PDC group for the contained layouts to simulate the correct environment"

This reverts commit dc347d529a1c04de7e7e2e1b9914ad77036760fd.
Revert "LPS-44232 Use group mappings when validating or importing missing referenes"

This reverts commit dfe96fbac9737938c5083bd146bac3fb39b4bd64.
Revert "LPS-44232 Fill group mapping when importing models"

This reverts commit a7b7fec32f35ab9cc31c514f44d41bc58724c9de.
Revert "LPS-44232 Apply renaming"

This reverts commit b449d729bd95c19e827e414e4c64a846e660197c.