Minor touchup to ensure hwthreads are correctly bound, and setting LSF affinity operations to hwthreads-as-cpus by default

Pulled from master commits:

open-mpi/ompi@b314bfb5e98c216db1ebb15052d3b678859de227
open-mpi/ompi@43a40f8aacaceb288f2e359367e6229a971de16d

@jsquyres should be quick review