Cleanup unique disk name creation

The unique disk name creation was not very stable, and the unstable names broke cinder proposal application. 

Also add support for cciss devices.