Merge 3.3.x into master#938

jmini merged 11 commits intomasterOpenAPITools/openapi-generator:masterfrom

3.3.xOpenAPITools/openapi-generator:3.3.xCopy head branch name to clipboard