Big bundle of tweaks to get 3.3 to build#39

Swiddis merged 7 commits intoopensearch-project:mainopensearch-project/sql-cli:mainfrom

Swiddis:bugfix/3.3-fixesSwiddis/sql-cli:bugfix/3.3-fixesCopy head branch name to clipboard