TRQ-2561 - Merge from develop. (./configure --with-hwloc failing on CentOS 5)