Merging in a fix from master.

Fix bug MONDRIAN-1122, "Aggregation is not supported over a list with more than 1000 predicates". We should not check the size of the list of constraints for composite slicer; it is only a problem if we are evaluating distinct-count measures, and they are relatively unusual.
(cherry picked from commit 5b5dbac)