Merge branch 'master' into 2.0.x

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java

@@ -48,7 +48,7 @@ public class SampleController
 	@Autowired
 	private SampleBackground controller;
 
-	private Random random = new Random();
+	private final Random random = new Random();
 	private int port;
 
 	@RequestMapping("/")

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java

@@ -31,8 +31,6 @@ import org.springframework.web.client.RestTemplate;
 @EnableAsync
 public class SampleSleuthApplication {
 
-	public static final String CLIENT_NAME = "testApp";
-
 	@Bean
 	public RestTemplate restTemplate() {
 		return new RestTemplate();