Fix intel compile errors.
Merge branch 'scheduler_cleanup' of github.com:STEllAR-GROUP/hpx into scheduler_cleanup