Merge hydra-specific hwloc patches from r10740.

No reviewer.

git-svn-id: https://svn.mcs.anl.gov/repos/mpi/mpich2/trunk/src/pm/hydra@10818 a5d90c62-d51d-0410-9f91-bf5351168976