Revert changes made to allow Bono to be behind a P-CSCF
Pick up new record-routing command-line option