Merge "ToscaEntityType renamed ToscaSchemaDefinition"