Revert "Updated baseQuery() grammar in Parser"

This reverts commit 3bcb08454d80cec0d2a04836f9ed542f2db6003f.
added FIXME to buggy Parser.baseQuery()
BasicSolver now contains code to form groups of properties from
constraints

The idea is to form groups of constraints that have inter-dependencies.
Once we have these groups, we can avoid full backtracking which is
very expensive, and instead re-materialize only the relevant properties.
Added sample definition for constraint groups