Merge remote-tracking branch 'upstream/develop' into PLFM-1174

Conflicts:
	client/synapseJavaClient/src/main/java/org/sagebionetworks/client/SynapseAdminClient.java
	client/synapseJavaClient/src/main/java/org/sagebionetworks/client/SynapseAdminClientImpl.java
	services/repository/src/main/java/org/sagebionetworks/repo/web/controller/AdministrationController.java
	services/repository/src/main/java/org/sagebionetworks/repo/web/service/AdministrationService.java
	services/repository/src/main/java/org/sagebionetworks/repo/web/service/AdministrationServiceImpl.java
pull from develop and fix test
Merge pull request #1296 from jay-hodgson/SWC-1420

fix test (after pulling from upstream develop)
Merge remote-tracking branch 'upstream/develop' into PLFM-1174
adjust test for new synapse client behaviour
throw SynapseServerException if throttled.
Merge pull request #1297 from jay-hodgson/SWC-1420

SWC-1420: throw root SynapseServerException if throttled
Merge pull request #1292 from marcel-blonk/PLFM-1174

Throttle the number of concurrent non-anonymous requests
name change per code review
code review: check for exceptions by asking futures. Also collapse 2 tests
Merge pull request #1298 from marcel-blonk/PLFM-1174

Plfm 1174 code review comments
Merge remote-tracking branch 'upstream/develop' into PLFM-2791