Merge "Add AZ to instances and image/server to volumes" into release/2019.2.0