Merge pull request #10235 from mpg/cleanup-oid

Clean up after crypto hides its OID module