Merge pull request #3514 from anandpdoshi/anand-june-24

[fix] Use per_billed instead of per_delivered and per_received for open notification