Merge branch 'energy'

Conflicts:
	configure
	doc/html/documentation.shtml
	src/common/cpu_frequency.c
	src/common/slurm_jobacct_gather.c
	src/common/slurm_protocol_defs.c
	src/common/slurm_protocol_defs.h
	src/plugins/accounting_storage/mysql/as_mysql_job.c
	src/sstat/sstat.c