Fix IlmBase 2.1 build breakages
(other minor changes are due to syncing with the analogous file in OIIO)