Add proxy-(orig|term) token definitions
Add proxy-orig and proxy-term flags to sprout rr headers
Change proxy-(orig|term) to charge-(orig|term) and only include it at the start-of-originating and end-of-terminating processing
Refactor ACR factory to take the node role on get_acr
Refactor non_cancel processing into separate routing-proxy and access-proxy processing
Refactor routing proxy processing into in-dialog / out-of-dialog
Add downstream ACR processing for in-dialog requests
Correct roles when record-routing
Charge on every hop instead - otherwise AS interactions can lead to missing STOPs
Markups
Merge pull request #589 from Metaswitch/issue532

[Reviewer: Mike][From: Alex]