The Slurm devs fixed everything upstream for me, so starting with Slurm 14.11, --clusters will work without modification. For older versions I've provided a patch rather than a description of what to modify.