The official service type name for cinder is not volume (or volumevN)
but block-storage. Use the block-storage type to detect availability
of cinder, in addition to legacy volume/volumev3 service type.
'block-store' is also a valid alias and should be added as well.
Closes-Bug: #2084794
Change-Id: Ifbeaba033c6dae0fa704a2be568b2f4e2cb7426a