Explicitly list protocols that are allowed, rather than using their initials.  Also, add cid, which I need for my mailstream plugin to work.
Add the contact ID to some log lines in onepoll.php, to aid debugging