Fix for CPU binding for job steps run under a batch job

This is a partial reversion of commit 69684648
NOTE: sbatch does not support --cpu_bind (although the documentation does list
  the option) and the --mem_bind options set SBATCH_* environment variables
  that nothing every looks at. In other words, it needs some work.
Bugs 3519 and 3188