JENKINS-17086 Undo some whitespace changes