PRD-4723: Datasource editor for query scripting still buggy
Merge branch 'master' into PRD-4723
new branch after 5.0 release
PRD-4661: Borders on a band with children that have 100% height caused invalid layouts
Merge pull request #234 from tmorgner/PRD-4661

PRD-4661: Borders on a band with children that have 100% height caused invalid layouts
Merge pull request #236 from tmorgner/PRD-4702

PRD-4702: DocSupport declared itself as toc-module and caused havoc on publish
Merge pull request #240 from tmorgner/PRD-4729

PRD-4729 - Build fix for testcases project
Merge pull request #241 from tmorgner/PRD-4723

PRD-4723: Additional fix for datasource editor query scripting
PRD-4692: Disable the test completely, it cannot be tested.
Merge pull request #243 from tmorgner/PRD-4692

PRD-4692: Test case fixes
Merge remote-tracking branch 'origin/PRD-4689' into 5.0
PRD-4754 - Fixing MacOS build
PRD-4754 - Fixing MacOS build
Merge remote-tracking branch 'origin/PRD-4754_branch50' into PRD-5.0-obesity

Conflicts:
	designer/report-designer-assembly/build.properties
	designer/report-designer-assembly/build.xml
	designer/report-designer-assembly/report-designer-assembly.iml
	engine/core/build.properties
	libraries/libformula-ui/test/org/pentaho/openformula/ui/FormulaEditorPanelTest.java
PRD-4754 - Undo mac jdk definition