Respect availability zones and OS image names in service definition

Change-Id: I0ebc65092ccd3c17bf823c3e20d6f83ed580d280