almost remove the need for jenkins settings
Merge pull request #2252 from andymckay/1021991-two

almost remove the need for jenkins settings