Added availability_zone as a configurable option for blockstorage.

Change-Id: I936197af9a8de02008b2e4fb42453c2e0b8454f3
Merge "Added availability_zone as a configurable option for blockstorage."