commit before changing to flat jobtypes
Merge branch 'master' of github.com:azkaban/azkaban2