Revert "ALPS - Remove sanity code to work like it did in 2.5. This is an addition"

This reverts commit 2c95e2d2.

Conflicts:
	src/plugins/select/alps/basil_interface.c

This is related to bug 1822.  It isn't clear why the code was taken out in
this commit in the first place and based off of commit 2e2de6a4 (which is
the reason for the conflict) we tried unsuccessfully to put it back.

It appears the only difference here is the addition of
always setting mppnppn = 1 instead of always to
job_ptr->details->ntasks_per_node when no ntasks is set.

This appears to only be an issue with salloc or sbatch as ntasks
is always set for srun.

NEWS

@@ -27,6 +27,8 @@ documents those changes that are of interest to users and administrators.
     SLURM_MEM_PER_CPU and SLURM_MEM_PER_NODE environment variables.
  -- Prevent slurmctld abort on update of advanced reservation that contains no
     nodes.
+ -- ALPS - Revert commit 2c95e2d22 which also removes commit 2e2de6a4 allowing
+    cray with the SubAllocate option to work as it did with 2.5.
 
 * Changes in Slurm 14.11.8
 ==========================

src/plugins/select/alps/basil_interface.c

@@ -754,13 +754,15 @@ extern int do_basil_reserve(struct job_record *job_ptr)
 
 	if (cray_conf->sub_alloc) {
 		mppdepth = MAX(1, job_ptr->details->cpus_per_task);
-		if (!job_ptr->details->ntasks_per_node
-		    && job_ptr->details->num_tasks) {
+		if (job_ptr->details->ntasks_per_node) {
+			mppnppn  = job_ptr->details->ntasks_per_node;
+		} else if (job_ptr->details->num_tasks) {
 			mppnppn = (job_ptr->details->num_tasks +
 				   job_ptr->job_resrcs->nhosts - 1) /
 				job_ptr->job_resrcs->nhosts;
-		} else
-			mppnppn  = job_ptr->details->ntasks_per_node;
+		} else {
+			mppnppn = 1;
+		}
 	} else {
 		/* always be 1 */
 		mppdepth = 1;