Refactor so that Query is in same package as in Core Persistence.
Also move Query tree into Core Persistence compatible package.
Everything compiles with one Query class, except for things that need query.getSelectionResult().
Wrapping up the one query parser work.
Merge branch 'one-query-parser' into two-dot-o
PathQueryIT tests now working.