TRQ-2471 - revert changes from TRQ-2319. Eliminate requirement for hwloc
1.2.