Fix IlmBase 2.1 build breakages

(other minor changes are due to syncing with the analogous file in OIIO)

The analogous OIIO review is here:  https://github.com/OpenImageIO/oiio/pull/842