Bug 1572

option.

Modify test to work if "." is not in search path
Fix error message, change "sbatch" to "salloc"

of 4.

Only going to do this in the master as it may affect scripts.

This reverts commit 454f78e6.

Conflicts:
	NEWS

Conflicts:
	testsuite/expect/globals
	testsuite/expect/test12.4

bug 1724

Conflicts:
	src/plugins/accounting_storage/mysql/as_mysql_archive.c

Not sure why it was failing in slurmd on smd, but this fixes it

This is to translate the CPU lists in gres.conf to the local
  CPU ID values used by cpuset bitmaps

Previously the test would generate an error if the default partition
  contained less than 3 nodes
bug 1720

Add a new GRES function to return the count of elements of a specific
  GRES name
Add a new GRES funtion to reset environment variables based upon the
  GRES which are usable from the CPUs to which a task is bound