Clean up of PlannerQuery and QueryGraph
Merge pull request #2574 from systay/tiny-cleanup

Tiny cleanup