Resolved Cherry Pick conflicts

Refactored

Refactored based on conversations with wider team

Updates per code review

spring-cloud-task-samples/taskprocessor/pom.xml

@@ -14,6 +14,7 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>1.3.5.RELEASE</version>
+		<relativePath/>
 	</parent>
 
 	<properties>
@@ -114,6 +115,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
+				<version>3.0.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>