Refactoring of QueryPlan construction

Moved all QueryPlan producers into an object - QueryPlanProducer
Merge pull request #2383 from systay/queryplanproducer

Refactoring of QueryPlan construction