Resolve confict on failed merge
Remove dupicate code block - cleanup
Resolve conflict
Corrected get_controller parameter type
Updated for new pyslurm classes
Added ability to convert slurm hex version to string, also added ability to support versions of slurm via min and max range variables if we decide that the there are no changes to the Slurm API that would affect PySlurm
Slight cleanup
Add default hostlist in class constructor as empty string
Merge branch 'slurm-14.11'