Merge "Adding ability to set default_availability_zone for nova controller."