Bug 7032 - Remove deprecated use of ${CALLERIDNUM}