Merge pull request #14 from daniellemayne/2013.02

bugzid 3251: allow volume attach on running server, also backported bug fixes found during 2013.07 testing