Make the "Messages" calculations consistent accross reports

Messaging Summary Report & Notifications_Report show different numbers of messages due to:

Different inclusions/exclusions of delivery states, eg delivered/sent/fails
Logic around number of messages vs actual number of messages sent due to 160 character limit

Need to consider why there are two reports, and choose consistent definitions to merge back together