A proposed fix for issue #26 fixes #26

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java

@@ -83,7 +83,7 @@ public void initialize(ConfigurableApplicationContext applicationContext) {
 		}
 		if (!empty) {
 			MutablePropertySources propertySources = applicationContext.getEnvironment()
-					.getPropertySources();
+					.getPropertySources();			
 			if (propertySources.contains(BOOTSTRAP_PROPERTY_SOURCE_NAME)) {
 				propertySources.remove(BOOTSTRAP_PROPERTY_SOURCE_NAME);
 			}
@@ -101,27 +101,27 @@ private void setLogLevels(ConfigurableEnvironment environment) {
 				.<String> emptySet()));
 	}
 
-	private void insertPropertySources(MutablePropertySources propertySources,
-			CompositePropertySource composite) {
+	private void insertPropertySources(MutablePropertySources propertySources, CompositePropertySource composite) {
 		MutablePropertySources incoming = new MutablePropertySources();
 		incoming.addFirst(composite);
 		PropertySourceBootstrapProperties remoteProperties = new PropertySourceBootstrapProperties();
 		new RelaxedDataBinder(remoteProperties, "spring.cloud.config")
 				.bind(new PropertySourcesPropertyValues(incoming));
-		if (!remoteProperties.isAllowOverride()
-				|| remoteProperties.isOverrideSystemProperties()) {
-			propertySources.addFirst(composite);
-			return;
-		}
-		if (propertySources
-				.contains(StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME)) {
-			propertySources.addAfter(
-					StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME,
-					composite);
-		}
-		else {
-			propertySources.addLast(composite);
-		}
+
+		if(remoteProperties.isAllowOverride()) {
+			if(remoteProperties.isOverrideNoProperties()) {
+				propertySources.addLast(composite);
+				return;
+			} else if (!remoteProperties.isOverrideSystemProperties() && propertySources
+					.contains(StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME)) {
+				propertySources.addAfter(
+						StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, composite);
+				return;
+			}
+		} 
+
+		propertySources.addFirst(composite);		
+
 	}
 
 }

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapProperties.java

@@ -11,10 +11,17 @@ public class PropertySourceBootstrapProperties {
 	 */
 	private boolean overrideSystemProperties = true;
 
+	/**
+	 * Flag to indicate that the external properties shouldn't override any other specified 
+	 * property sources
+	 * Default false.
+	 */
+	private boolean overrideNoProperties = false;
+
 	/**
 	 * Flag to indicate that {@link #isSystemPropertiesOverride()
-	 * systemPropertiesOverride} can be used. Set to false to prevent users from changing
-	 * the default accidentally. Default true.
+	 * systemPropertiesOverride} and {@link #isOverrideNoProperties() overrideNoProperties} can be used.
+	 * Set to false to prevent users from changing the default accidentally. Default true.
 	 */
 	private boolean allowOverride = true;
 
@@ -25,6 +32,14 @@ public boolean isOverrideSystemProperties() {
 	public void setOverrideSystemProperties(boolean overrideSystemProperties) {
 		this.overrideSystemProperties = overrideSystemProperties;
 	}
+
+	public boolean isOverrideNoProperties() {
+		return overrideNoProperties;
+	}
+
+	public void setOverrideNoProperties(boolean overrideNoProperties) {
+		this.overrideNoProperties = overrideNoProperties;
+	}
 
 	public boolean isAllowOverride() {
 		return allowOverride;