Merge branch 'develop' into stable

beedk-acs-platform-it-tile/tile.xml

@@ -57,6 +57,8 @@
 										<skip>${skipTests}</skip>
 										<env>
 											<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
+											<ENABLE_JDWP>false</ENABLE_JDWP>
+											<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
 											<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
 												-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
 												-Dtransform.service.enabled=${beedk.deploy.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
@@ -203,7 +205,7 @@
 				<!-- versions -->
 				<acs-postgres.version>9.6</acs-postgres.version>
 				<acs-activemq.version>5.15.8</acs-activemq.version>
-				<tomcat-rad.version>9-1.3</tomcat-rad.version>
+				<tomcat-rad.version>9-1.4</tomcat-rad.version>
 			</properties>
 		</profile>
 	</profiles>