JENKINS-20756 Fixed support for folders plugin more fixes