Handle aggregate queries correctly
Merge remote-tracking branch 'upstream/develop' into PLFM-3108
Merge remote-tracking branch 'upstream/develop' into PLFM-3108

Conflicts:
	services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/AuthorizationManagerImpl.java
Merge pull request #1644 from marcel-blonk/PLFM-3108

Handle aggregate queries correctly