Only override callingpres set by rpid if user/peer preference is set. (Issue #7240)