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

Jenkins 21496