Return deviceId rather than device number for Volumes

This was causing a problem in https://enstratus.fogbugz.com/default.asp?5119 since deviceNumbers (like 5,6,7) were being returned rather than ids (/dev/xvdh etc).