updated jenkins.pp
corrected merge