Merge "func_callerid: Remove deprecated CALLERPRES() function."