Fix moving the AVP list from UAS to UAC in B2B.

Closes issue #230
Many thanks to Ovidiu Sas for report and debugging.

(cherry picked from commit c760b69cb4f1b56b91112ab457fef232b5753fbd)