Port across the LSF affinity support changes, based on the following master commits:

open-mpi@3f9d9ae
open-mpi@960ef34
open-mpi@f92ccaf
open-mpi@c4002a8
open-mpi@c4fd6d1
Remove merge conflict cruft
Add missing header
Merge pull request #111 from rhc54/cmr/lsf-integration

Tighten LSF integration by adding support for affinity settings