general bug fixes and improvements
Merge branch 'release-2.1' of github.com:azkaban/azkaban-plugins into release-2.1