PRD-4723: Datasource editor for query scripting still buggy
Merge branch 'master' into PRD-4723
Merge pull request #241 from tmorgner/PRD-4723

PRD-4723: Additional fix for datasource editor query scripting