fix schedule/executionoption may be null with older versions of code
Merge branch 'release-2.1' of github.com:azkaban/azkaban2 into release-2.1