Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
APID merge.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Initial commit for the Cray switch plugin.
Merge remote-tracking branch 'work/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/plugins/task/cray/task_cray.c
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/plugins/switch/cray/Makefile.am
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/plugins/switch/cray/Makefile.am
	src/plugins/task/cray/task_cray.c
Added header files for the switch and task plugin.
Added send_cookie_to_app and set_pmi_no_fork functions to task_cray.c.
Worked in the changes made by SchedMD to get the correct formal parameters
to the different switch plugin functions.
Added the two header files for the ALPS Common libraries.
Merging in home changes.

Merge remote-tracking branch 'home/master'
A fix with missing GNI definition.
A fix for missing formal parameters to a switch plugin function.
Merge remote-tracking branch 'home/master'
Commenting out gni header that cannot be found.
Commenting out gni header file that cannot be found.
Merge remote-tracking branch 'home/master'
Correcting memory scaling calculation for network configuration.
Merge remote-tracking branch 'home/master'
Merge remote-tracking branch 'origin/master'