CurrentOperationIdHolder is a final class that exposes a protected method, which is pointless. Make it package protected.

Also remove the IDE warn about a deprecated class still being used. The @Deprecated is to warn unintended callers off using it but the intended uses are likely not going away.