CMS-2560 Create TermFacetQuery
 CMS-2561 Create QueryFacetQuery

 Added terms and query-facet, with the needed stuff around