It is just fine to map by node or slot and bind, so ensure the switch statement includes those options. Thanks to Tatsuya Mishima for point it out.

Refs #4240
Check for --cpus-per-proc earlier, before the correct option can be processed. Thanks to Tetsuya Mishima for reporting it.

Refs #4117
Correct the handling of various map/bind combinations when pe=N is given. Thanks to Elena Elkina for reporting it.

Refs #4117