Fix shutdown sequence for payment Janitor and refactor Janitor task code
Merge branch 'master' of github.com:killbill/killbill