Add the '-cc' option to the aprun command.

With the aprun default of '-cc cpu', we only get kernel scheduling
affinity with a single KNC CPU.  In order to get scheduling affinity
with all of them, we need to give some other option.  The '-cc none'
we give on other Cray system compute nodes seems to work fine for
this.

While here, I also removed some trailing white space on one line.

(cherry picked from commit b6f1c1b663c494684d67dbc7d261bfe185f5e2f5)