Sync to r31529
Merge branch 'master' of github.com:open-mpi/orcm

Conflicts:
	orcm/mca/sensor/Makefile.am
	orcm/mca/sensor/base/Makefile.am
	orcm/mca/sensor/base/base.h
	orcm/mca/sensor/base/sensor_base_fns.c
	orcm/mca/sensor/base/sensor_base_frame.c
	orcm/mca/sensor/base/sensor_base_select.c
	orcm/mca/sensor/base/sensor_private.h
	orcm/mca/sensor/coretemp/Makefile.am
	orcm/mca/sensor/coretemp/configure.m4
	orcm/mca/sensor/coretemp/help-orte-sensor-coretemp.txt
	orcm/mca/sensor/coretemp/sensor_coretemp.c
	orcm/mca/sensor/coretemp/sensor_coretemp.h
	orcm/mca/sensor/coretemp/sensor_coretemp_component.c
	orcm/mca/sensor/file/Makefile.am
	orcm/mca/sensor/file/configure.m4
	orcm/mca/sensor/file/help-orte-sensor-file.txt
	orcm/mca/sensor/file/sensor_file.c
	orcm/mca/sensor/file/sensor_file.h
	orcm/mca/sensor/file/sensor_file_component.c
	orcm/mca/sensor/freq/Makefile.am
	orcm/mca/sensor/freq/configure.m4
	orcm/mca/sensor/freq/help-orte-sensor-freq.txt
	orcm/mca/sensor/freq/sensor_freq.c
	orcm/mca/sensor/freq/sensor_freq.h
	orcm/mca/sensor/freq/sensor_freq_component.c
	orcm/mca/sensor/ft_tester/Makefile.am
	orcm/mca/sensor/ft_tester/configure.m4
	orcm/mca/sensor/ft_tester/sensor_ft_tester.c
	orcm/mca/sensor/ft_tester/sensor_ft_tester.h
	orcm/mca/sensor/ft_tester/sensor_ft_tester_component.c
	orcm/mca/sensor/heartbeat/Makefile.am
	orcm/mca/sensor/heartbeat/configure.m4
	orcm/mca/sensor/heartbeat/help-orte-sensor-heartbeat.txt
	orcm/mca/sensor/heartbeat/sensor_heartbeat.c
	orcm/mca/sensor/heartbeat/sensor_heartbeat.h
	orcm/mca/sensor/heartbeat/sensor_heartbeat_component.c
	orcm/mca/sensor/pwr/Makefile.am
	orcm/mca/sensor/pwr/configure.m4
	orcm/mca/sensor/pwr/help-orte-sensor-pwr.txt
	orcm/mca/sensor/pwr/sensor_pwr.c
	orcm/mca/sensor/pwr/sensor_pwr.h
	orcm/mca/sensor/pwr/sensor_pwr_component.c
	orcm/mca/sensor/resusage/Makefile.am
	orcm/mca/sensor/resusage/configure.m4
	orcm/mca/sensor/resusage/help-orte-sensor-resusage.txt
	orcm/mca/sensor/resusage/sensor_resusage.c
	orcm/mca/sensor/resusage/sensor_resusage.h
	orcm/mca/sensor/resusage/sensor_resusage_component.c
	orcm/mca/sensor/sensor_types.h
	orcm/mca/sensor/sigar/Makefile.am
	orcm/mca/sensor/sigar/configure.m4
	orcm/mca/sensor/sigar/help-orte-sensor-sigar.txt
	orcm/mca/sensor/sigar/sensor_sigar.c
	orcm/mca/sensor/sigar/sensor_sigar.h
	orcm/mca/sensor/sigar/sensor_sigar_component.c
	orcm/test/orte_sensor.c