diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java b/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
index ff65a7c1f9..0da5990591 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
@@ -75,32 +75,27 @@ public class CommandAgent implements Service, ExceptionListener {
      */
     @PreDestroy
     public void stop() throws Exception {
-        ServiceStopper stopper = new ServiceStopper();
         if (consumer != null) {
             try {
                 consumer.close();
                 consumer = null;
-            } catch (JMSException e) {
-                stopper.onException(this, e);
+            } catch (JMSException ignored) {
             }
         }
         if (session != null) {
             try {
                 session.close();
                 session = null;
-            } catch (JMSException e) {
-                stopper.onException(this, e);
+            } catch (JMSException ignored) {
             }
         }
         if (connection != null) {
             try {
                 connection.close();
                 connection = null;
-            } catch (JMSException e) {
-                stopper.onException(this, e);
+            } catch (JMSException ignored) {
             }
         }
-        stopper.throwFirstException();
     }
 
     // Properties
diff --git a/activemq-karaf/src/main/resources/org/apache/activemq/karaf/commands/spring.xml b/activemq-karaf/src/main/resources/org/apache/activemq/karaf/commands/spring.xml
index 3de5938234..d5f4051053 100644
--- a/activemq-karaf/src/main/resources/org/apache/activemq/karaf/commands/spring.xml
+++ b/activemq-karaf/src/main/resources/org/apache/activemq/karaf/commands/spring.xml
@@ -101,7 +101,7 @@
         -->
 
         <shutdownHooks>
-           <bean xmlns="http://www.springframework.org/schema/beans" id="hook" class="org.apache.activemq.hooks.SpringContextHook" />
+           <bean xmlns="http://www.springframework.org/schema/beans" id="hook" class="org.apache.activemq.hooks.SpringOsgiContextHook" />
         </shutdownHooks>
 
         <!-- The transport connectors ActiveMQ will listen to -->
diff --git a/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java b/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java
index 5b1fef652b..e22a3d82fa 100644
--- a/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java
+++ b/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java
@@ -16,32 +16,19 @@
  */
 package org.apache.activemq.hooks;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.osgi.framework.BundleException;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
 
 public class SpringContextHook implements Runnable, ApplicationContextAware {
 
-    private static final transient Logger LOG = LoggerFactory.getLogger(SpringContextHook.class);
     ApplicationContext applicationContext;
     
     public void run() {
         if (applicationContext instanceof ConfigurableApplicationContext) {
             ((ConfigurableApplicationContext) applicationContext).close();
         }
-        if (applicationContext instanceof OsgiBundleXmlApplicationContext){
-            try {
-                ((OsgiBundleXmlApplicationContext)applicationContext).getBundle().stop();
-            } catch (BundleException e) {
-                LOG.info("Error stopping OSGi bundle " + e, e);
-            }
-        }
-
     }
 
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
diff --git a/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringOsgiContextHook.java b/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringOsgiContextHook.java
new file mode 100644
index 0000000000..a544a68aa2
--- /dev/null
+++ b/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringOsgiContextHook.java
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.hooks;
+
+import org.osgi.framework.BundleException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
+
+public class SpringOsgiContextHook implements Runnable, ApplicationContextAware {
+
+    private static final transient Logger LOG = LoggerFactory.getLogger(SpringOsgiContextHook.class);
+    ApplicationContext applicationContext;
+    
+    public void run() {
+        if (applicationContext instanceof ConfigurableApplicationContext) {
+            ((ConfigurableApplicationContext) applicationContext).close();
+        }
+        if (applicationContext instanceof OsgiBundleXmlApplicationContext){
+            try {
+                ((OsgiBundleXmlApplicationContext)applicationContext).getBundle().stop();
+            } catch (BundleException e) {
+                LOG.info("Error stopping OSGi bundle " + e, e);
+            }
+        }
+
+    }
+
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
+
+}
diff --git a/assembly/pom.xml b/assembly/pom.xml
index a4bcee4ef5..ed8399b07b 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -125,10 +125,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jms</artifactId>
@@ -293,6 +289,12 @@
       <artifactId>jasypt</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.jasypt</groupId>
+      <artifactId>jasypt-spring3</artifactId>
+      <version>${jasypt-version}</version>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -341,6 +343,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>validate-config</id>
+            <phase>test-compile</phase>
+            <goals>
+             <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <executions>
@@ -352,6 +366,9 @@
             </goals>
             <configuration>
              <forkMode>pertest</forkMode>
+             <environmentVariables>
+                 <ACTIVEMQ_ENCRYPTION_PASSWORD>activemq</ACTIVEMQ_ENCRYPTION_PASSWORD>
+             </environmentVariables>
             </configuration>
           </execution>
         </executions>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index ab168b6c1b..fcfa95d062 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -127,7 +127,6 @@
       <includes>
         <include>org.apache.camel:camel-core</include>
         <include>org.apache.camel:camel-spring</include>
-        <include>org.apache.camel:camel-jetty</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.activemq:activemq-camel</include>
       </includes>
@@ -171,6 +170,7 @@
         <include>org.apache.velocity:velocity</include>
         <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.josql</include>
         <include>org.jasypt:jasypt</include>
+        <include>org.jasypt:jasypt-spring3</include>
         <include>javax.jmdns:jmdns</include>
       </includes>
     </dependencySet>
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index ea5bbb1aff..8a4c031f93 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -145,6 +145,11 @@
             <transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"/>
         </transportConnectors>
 
+        <!-- destroy the spring context on shutdown to stop jetty -->
+        <shutdownHooks>
+            <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" />
+        </shutdownHooks>
+
     </broker>
 
     <!--
diff --git a/assembly/src/sample-conf/activemq-demo.xml b/assembly/src/sample-conf/activemq-demo.xml
index de2f428399..4b274b4b0f 100644
--- a/assembly/src/sample-conf/activemq-demo.xml
+++ b/assembly/src/sample-conf/activemq-demo.xml
@@ -47,7 +47,7 @@
           - Change the brokerName attribute to something unique
     -->
 
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker" useJmx="true" destroyApplicationContextOnStop="true">
+    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker" useJmx="true">
 
         <!--
             Examples of destination-specific policies using destination
@@ -205,6 +205,11 @@
             <transportConnector name="xmpp" uri="xmpp://localhost:61222"/>
         </transportConnectors>
 
+        <!-- destroy the spring context on shutdown to stop jetty -->
+        <shutdownHooks>
+            <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" />
+        </shutdownHooks>
+
     </broker>
 
     <!--
diff --git a/assembly/src/sample-conf/activemq-security.xml b/assembly/src/sample-conf/activemq-security.xml
index 94e9d197e9..cbdacc2674 100644
--- a/assembly/src/sample-conf/activemq-security.xml
+++ b/assembly/src/sample-conf/activemq-security.xml
@@ -70,9 +70,9 @@
             <property xmlns="http://www.springframework.org/schema/beans" name="environment">
                 <map xmlns="http://www.springframework.org/schema/beans">
                     <entry xmlns="http://www.springframework.org/schema/beans" key="jmx.remote.x.password.file"
-                           value="conf/jmx.password"/>
+                           value="${activemq.conf}/jmx.password"/>
                     <entry xmlns="http://www.springframework.org/schema/beans" key="jmx.remote.x.access.file"
-                           value="conf/jmx.access"/>
+                           value="${activemq.conf}/jmx.access"/>
                 </map>
             </property>
         </managementContext>
@@ -116,7 +116,12 @@
     <transportConnectors>
        <transportConnector name="default" uri="tcp://0.0.0.0:61616"/>
     </transportConnectors>
-    
+
+    <!-- destroy the spring context on shutdown to stop jetty -->
+    <shutdownHooks>
+        <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" />
+    </shutdownHooks>
+
   </broker>
 
   <!-- 
diff --git a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
index 7300e0647b..649998f713 100755
--- a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
+++ b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
@@ -28,11 +28,13 @@ import javax.jms.JMSException;
 
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerContext;
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnection;
 import org.apache.activemq.broker.TransportConnector;
 import org.apache.activemq.transport.stomp.StompConnection;
+import org.apache.activemq.util.URISupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +70,7 @@ public class BrokerXmlConfigStartTest extends TestCase {
         // alive, now try connect to connect
         try {
             for (TransportConnector transport : broker.getTransportConnectors()) {
-                final URI UriToConnectTo = transport.getConnectUri();
+                final URI UriToConnectTo = URISupport.removeQuery(transport.getConnectUri());
                  
                 if (UriToConnectTo.getScheme().startsWith("stomp")) {
                     LOG.info("validating alive with connection to: " + UriToConnectTo);
@@ -98,6 +100,9 @@ public class BrokerXmlConfigStartTest extends TestCase {
 
     public void setUp() throws Exception {
         System.setProperty("activemq.base", "target");
+        System.setProperty("activemq.home", "target"); // not a valid home but ok for xml validation
+        System.setProperty("activemq.data", "target");
+        System.setProperty("activemq.conf", "target/conf");
         secProps = new Properties();
         secProps.load(new FileInputStream(new File("target/conf/credentials.properties")));
     }