Merge pull request #467 from claco/stable/icehouse

backport - stable/icehouse - Updated cinder.conf to allow for AZ setup