Revert "Use directly '--with-hwloc' configopt for MVAPICH2 1.7 instead of to-be-removed 'withhwloc' from MVAPICH2 EB" This reverts commit 6db12d99.