Reverse priority of property sources when extracting sub properties

(cherry picked from commit 300e570)
Fixes gh-2261
See gh-1259

Conflicts:
	spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java

Author: Dave Syer

spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java

@@ -67,7 +67,7 @@ public static Map<String, Object> getSubProperties(PropertySources propertySourc
 						.getPropertyNames()) {
 					String key = PropertySourceUtils.getSubKey(name, rootPrefix,
 							keyPrefixes);
-					if (key != null) {
+					if (key != null && !subProperties.containsKey(key)) {
 						subProperties.put(key, source.getProperty(name));
 					}
 				}

spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java

@@ -18,16 +18,20 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.StandardEnvironment;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -174,4 +178,29 @@ public void subProperties() throws Exception {
 		assertThat(subProperties.get("a.d"), equalTo((Object) "3"));
 	}
 
+	@Test
+	public void testPropertySource() throws Exception {
+		Properties properties;
+		PropertiesPropertySource propertySource;
+		String propertyPrefix = "spring.datasource.";
+		String propertyName = "password";
+		String fullPropertyName = propertyPrefix + propertyName;
+		StandardEnvironment environment = new StandardEnvironment();
+		MutablePropertySources sources = environment.getPropertySources();
+		properties = new Properties();
+		properties.put(fullPropertyName, "systemPassword");
+		propertySource = new PropertiesPropertySource("system", properties);
+		sources.addLast(propertySource);
+		properties = new Properties();
+		properties.put(fullPropertyName, "propertiesPassword");
+		propertySource = new PropertiesPropertySource("properties", properties);
+		sources.addLast(propertySource);
+		RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(
+				environment, propertyPrefix);
+		String directProperty = propertyResolver.getProperty(propertyName);
+		Map<String, Object> subProperties = propertyResolver.getSubProperties("");
+		String subProperty = (String) subProperties.get(propertyName);
+		assertEquals(directProperty, subProperty);
+	}
+
 }