Switched tests to use the new planner.
Rename setEstimatedCardinality to withEstimatedCardinality
Merge pull request #3162 from pontusmelke/change-tests-to-newplanner

[2.2] Change tests to use new planner
Tagging for version 2.1.5
Back to development version.
2.1.5-SNAPSHOT -> 2.1.6-SNAPSHOT
Merged 2.1-maint into master