Fixing blockOn, and adding a more useful form
Merge pull request #57 from quidryan/JENKINS-18089

Fixing blockOn, and adding a more useful form