fix typo
fix wrong caller ID on transfer after resume

Ticket #4845.
Merge branch '4845-switchboard-resume-cid'