update switchboard_retrieve originate

This now does something similar to the other originate (i.e. from
a client using the dialer xlet for example).

This is a bit unfortunate, since these shenanigans are mostly needed
because of a somewhat doubtful behavior in asterisk.
remove unused mock
rename variable
Merge branch '5049-switchboard-cid-switcheroo'