LPS-48706 Simpler fix
Merge branch '6.2.1-ga2-juangon' of http://github.com/juangon/liferay-portal into 6.2.1-ga2-juangon
LPS-49338 Revert LPS-13464
LPS-49338 Fix incorrect logic
LPS-45455 Add Test
LPS-45455 getLayoutFullURL returns invalid URL
LPS-45455 Source formatting