Fix entitlement bugs for AO when cancelling BP
Merge branch 'master' of github.com:killbill/killbill