completed master merge accounting for refactor. Updated turbine2 version to one published to repo.spring.io

pom.xml

@@ -94,7 +94,7 @@
             <dependency>
                 <groupId>com.netflix.turbine</groupId>
                 <artifactId>turbine-core</artifactId>
-                <version>2.0.0-DP.1-SNAPSHOT</version>
+                <version>2.0.0-DP.1.1-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.netflix.rxjava</groupId>

spring-cloud-bus/pom.xml

@@ -63,6 +63,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-cloudfoundry-connector</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java

@@ -158,17 +158,17 @@ public class BusAutoConfiguration {
 
 	private boolean isFromSelf(RemoteApplicationEvent event) {
 		String originService = event.getOriginService();
-		String appName = getAppName();
-		return originService.equals(appName);
+		String serviceId = getServiceId();
+		return originService.equals(serviceId);
 	}
 
 	private boolean isForSelf(RemoteApplicationEvent event) {
 		return (event.getDestinationService() == null
 				|| event.getDestinationService().trim().isEmpty() || event
-				.getDestinationService().equals(getAppName()));
+				.getDestinationService().equals(getServiceId()));
 	}
 
-	private String getAppName() {
+	private String getServiceId() {
 		return context.getId();
 	}