Add smarter handling of ES errors
strip whitespace from queries
Merge pull request #3130 from dimagi/jsonobject-couchdbkit-version

use couchdbkit==0.6.5.5
Merge pull request #3076 from dimagi/handle-es-error

Add smarter handling of ES errors
Merge branch 'daily_form' into autostaging
Merge branch 'vellum-includes' into autostaging
Merge branch 'cloudcare-resume' into autostaging
Merge branch 'multimedia-case-properties' into autostaging
Merge remote-tracking branch 'origin/sql-dailyformstats' into autostaging
Merge remote-tracking branch 'origin/opmMaps' into autostaging
update submodule refs