Reverted some unneded changes
Fixed spelling mistake for JENKINS-17466