incorporated changes to make sure gluster isn't set up for single node clusters
Merge remote-tracking branch 'origin/develop' into develop