JENKINS-18429 fixes
Better plugin description in root jelly
Simplified a bit.

This was the change suggested by Jesse.
following the coding convention in Jenkins of 4 ws
simplified further
Merge branch 'pull-822'