Merge branch 'slurm-14.11' into slurm-15.08

Conflicts:
	META
	NEWS
	src/slurmctld/job_scheduler.c

NEWS

@@ -724,6 +724,9 @@ documents those changes that are of interest to users and administrators.
     has been modified to accept a "Pack" and "NoPack" option. These options can
     be used to override the CR_PACK_NODE configuration option.
 
+* Changes in Slurm 14.11.12
+===========================
+
 * Changes in Slurm 14.11.11
 ===========================
  -- Fix systemd's slurmd service from killing slurmstepds on shutdown.
@@ -733,6 +736,8 @@ documents those changes that are of interest to users and administrators.
     the Steps keyword.
  -- Fix potential memory corruption in _slurm_rpc_epilog_complete as well as
     _slurm_rpc_complete_job_allocation.
+ -- Fix incorrectly sized buffer used by jobid2str which will cause buffer
+    overflow in slurmctld. (Bug 2295.)
 
 * Changes in Slurm 14.11.10
 ===========================