Applied the following patches from the upstream hwloc 1.4 branch after
the v1.4.2 release:

https://svn.open-mpi.org/trac/hwloc/changeset/4481
https://svn.open-mpi.org/trac/hwloc/changeset/4483
https://svn.open-mpi.org/trac/hwloc/changeset/4532
https://svn.open-mpi.org/trac/hwloc/changeset/4542