Applied the following patches from the upstream hwloc 1.3 branch after
the v1.3.2 release:

https://svn.open-mpi.org/trac/hwloc/changeset/4306
https://svn.open-mpi.org/trac/hwloc/changeset/4309
https://svn.open-mpi.org/trac/hwloc/changeset/4314
https://svn.open-mpi.org/trac/hwloc/changeset/4319
https://svn.open-mpi.org/trac/hwloc/changeset/4340
https://svn.open-mpi.org/trac/hwloc/changeset/4345
