JENKINS-13592 adding start and end line. Merging PR's 1 and 2.