Merge "Add More Validations on TOSCA Model Format"