Updated sipXcustomCallerId reference.
Merge remote-tracking branch 'origin/release-4.6' into release-4.6