Bug 6943 - transition away from using CallerID header, when we really mean CallerIDNum