Merge pull request #14 from daniellemayne/develop

bugzid 3058: add uploaded to available volume state - develop
bugzid 3520: only return local volume options for CS4 and above