Merge pull request #2 from jenkinsci/master

sync
Merge pull request #3 from jenkinsci/master

Pull
Merge pull request #4 from jenkinsci/master

Sync
Restore some advanced options
Merge pull request #16 from rym002/JENKINS-21496

Jenkins 21496