split into multiple queries
Merge branch 'master' of github.com:dimagi/commcare-hq into emwf_query

Conflicts:
	corehq/apps/reports/filters/api.py
Use helper functions for es calls to share params
Merge pull request #2864 from dimagi/emwf_query

split into multiple queries