Few fixes + features for the Naginator plugin

A fix to an open issue (JENKINS-21950)