diff --git a/core/src/main/resources/META-INF/cloudstack/bootstrap/default-config-resources.xml b/core/src/main/resources/META-INF/cloudstack/bootstrap/default-config-resources.xml
new file mode 100644
index 00000000000..ae266d1e0a2
--- /dev/null
+++ b/core/src/main/resources/META-INF/cloudstack/bootstrap/default-config-resources.xml
@@ -0,0 +1,10 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="DefaultConfigResources" class="com.yourcompany.YourConfigClass">
+        <!-- properties of the bean -->
+    </bean>
+
+</beans>
diff --git a/core/src/main/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml.ori b/core/src/main/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml.ori
new file mode 100644
index 00000000000..fd1b68f2463
--- /dev/null
+++ b/core/src/main/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml.ori
@@ -0,0 +1,44 @@
+!--
+
+    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.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context.xsd"
+                      >
+
+    <context:annotation-config />
+
+    <!-- Import additional configuration -->
+    <import resource="classpath:default-config-resources.xml"/>
+
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="order" value="100" />
+        <property name="ignoreResourceNotFound" value="true" />
+        <property name="ignoreUnresolvablePlaceholders" value="true" />
+        <property name="locations" ref="DefaultConfigResources" />
+    </bean>
+
+</beans>
diff --git a/root@169.254.109.99 b/root@169.254.109.99
new file mode 100644
index 00000000000..5d1bf6e3685
Binary files /dev/null and b/root@169.254.109.99 differ
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index 0618d84370a..679b1d5920d 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -27,7 +27,7 @@ except ImportError:
         raise RuntimeError("python setuptools is required to build Marvin")
 
 
-VERSION = "4.20.0.0-SNAPSHOT"
+VERSION = "4.20.0.0"
 
 setup(name="Marvin",
       version=VERSION,