PIM-1899 : revert flexible query builder changes
Merge branch 'oro/grid' of github.com:akeneo/pim-community-dev into oro/grid