Merge pull request #466 from claco/proposed/juno

backport - proposed/juno - Updated cinder.conf to allow for AZ setup