LPS-48124 - Fix TCat errors and update linux images
Record
Record
LPS-48325 - Updating Alloy 1.5.x to fac97d1b8d672c31f5f5dcc6e06cb84271c154d3
LPS-48718 Updating CKEditor 3.6.x to 2b71803
LPS-48791
LPS-48719 - Updating Alloy 1.5.x to d56084c61c7a95706ebc9a384f51dda5a40006db
LPS-35382 It's possible to execute a portlet on a different page than it belongs to, when portlet.event.distribution=layout-set

Conflicts:
	portal-impl/src/com/liferay/portlet/PortletContainerImpl.java --> Removed as this class doesn't exist in 6.1
LPS-35382 Apply to LayoutAction (6.1)
LPS-35382 SF

Conflicts:
	portal-impl/src/com/liferay/portal/util/PropsValues.java
	portal-impl/src/com/liferay/portlet/PortletContainerImpl.java --> Reverted as it doesn't exist in 6.1
	portal-service/src/com/liferay/portal/kernel/util/PropsKeys.java
LPS-35382 SF in LayoutAction (6.1)
LPS-35382 Better comment?
LPS-35382 SF

Conflicts:
	portal-impl/src/portal.properties
LPS-48671 When ATOM feeds are used, the HTML encoding was not rendered properly as plain text.
Record
LPS-47132 Fix DISTINCT using CLOB in Oracle
LPS-47132 Source formatting
LPS-47261 Avoiding using CLOBs fields in SELECT DISTINCT clause
LPS-47261 Source formatting
Record