diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index 83881fc6a2..f0446eed71 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -30,10 +30,6 @@
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-trashcan-cleaner</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.alfresco.services</groupId>
-            <artifactId>alfresco-messaging-repo</artifactId>
-        </dependency>
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
diff --git a/pom.xml b/pom.xml
index 360567e1d9..1f21a8bc3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,6 @@
         <dependency.alfresco-trashcan-cleaner.version>2.4.1</dependency.alfresco-trashcan-cleaner.version>
         <dependency.alfresco-jlan.version>7.4</dependency.alfresco-jlan.version>
         <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
-        <dependency.alfresco-messaging-repo.version>1.2.22</dependency.alfresco-messaging-repo.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
         <dependency.alfresco-transform-service.version>2.2.0-A1</dependency.alfresco-transform-service.version>
@@ -297,17 +296,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.alfresco.services</groupId>
-                <artifactId>alfresco-messaging-repo</artifactId>
-                <version>${dependency.alfresco-messaging-repo.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-broker</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-server-root</artifactId>
diff --git a/repository/src/main/resources/alfresco/core-services-context.xml b/repository/src/main/resources/alfresco/core-services-context.xml
index b1d852015a..f025ecfc28 100644
--- a/repository/src/main/resources/alfresco/core-services-context.xml
+++ b/repository/src/main/resources/alfresco/core-services-context.xml
@@ -75,6 +75,9 @@
         <property name="propertiesPersister">
         	<bean class="org.alfresco.config.AlfrescoPropertiesPersister"/>
         </property>
+        <property name="order">
+            <value>9999999</value>
+        </property>
     </bean>
 
     <!-- Expand global properties and version information in bean definitions -->
@@ -101,6 +104,18 @@
         </property>
     </bean>
 
+    <bean id="default-properties-resolver" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="ignoreUnresolvablePlaceholders">
+            <value>true</value>
+        </property>
+        <property name="searchSystemEnvironment">
+            <value>false</value>
+        </property>
+        <property name="order">
+            <value>2147483647</value>
+        </property>
+    </bean>
+
 
     <!-- Load properties that must be shared between the        -->
     <!-- Alfresco server and its remote clients.                -->