Map resolution for multiple beans applies to plain Map interface declaration only

Issue: SPR-15117
(cherry picked from commit 8084da5)

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1183,7 +1183,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			}
 			return result;
 		}
-		else if (Map.class.isAssignableFrom(type) && type.isInterface()) {
+		else if (Map.class == type) {
 			Class<?> keyType = descriptor.getMapKeyType();
 			if (String.class != keyType) {
 				return null;