Get the trail ID before creating the ACR.
Merge pull request #676 from Metaswitch/ralf-iss88

[Reviewer: Mike] Get the trail ID before creating the ACR.
Take latest cpp-common