ALPS - Don't drain nodes if epilog fails.  It leaves them in drain state
with no way to get them out.

This fixes bug 1134.  It is advised the pro/epilog to call xtprocadmin in
the script instead of returning a non-zero exit code.
Fix issue with task/affinity oversubscribing cpus erroneously when
using --ntasks-per-node.

This is related to bug 1145.  What was happening is all the cpus were
allocated on one socket instead of a cyclic method.  While this is allowed
it is strange and resulted in this bug.  There appears to be a different
bug as to why the tasks were laid out in a block fashion in the first
place.
Fix misleading comments.  These represent a core mask, not CPU.
Only print warning message on test1.91 if running with FastSchedule=2
since this represents the user could be exaggerating their system.
MYSQL - Fix load of archive files.

This has apparently been broken from the get go.  This fixes bug 1172.

test21.22 should be updated to test the dump and load of a file that is
generated.
Revert "MYSQL - Fix load of archive files."

This reverts commit 1891936edb7c8639a0d530442a53d4faf49bafe5.
Revert "Revert "MYSQL - Fix load of archive files.""

This reverts commit 4d03d0b40835c405f277df03f52931ec337e7b34.

Make sure the correct Author is attributed here.
Merge remote-tracking branch 'origin/slurm-14.03'

Conflicts:
	testsuite/expect/test1.91