Implement listBranches and add some safety checks around setActiveVolume, minor renaming and fixup
Implement listBranches and add some safety checks around setActiveVolume, minor renaming and fixup

ClusterHQ/dvol,ClusterHQ/dvol,ClusterHQ/dvol