cons_tres handling of --cpus-per-task

Recognize when a job either did or did not explicitly specify the
--cpus-per-task option so that we can allocate more CPUs as appropriate
to satisfy --cpus-per-gpu and related option.