Remove rosetta.pdf from doc/html/Makefiles
select/cons_res plugin: CPU allocation logic fix

Correction to CPU allocation logic for cores without hyperthreading
Backport of
https://github.com/SchedMD/slurm/commit/1ef41ac9590e018e631eaefb31254622984b7d2d
In select/cons_res, correct logic to allocate whole sockets to jobs
Merge branch 'slurm-2.5'

Conflicts:
	doc/html/Makefile.am
	doc/html/Makefile.in