fix TOSCA to spec and add zone prop to vm