PLFM-2698
PLFM-2698
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into PLFM-2698
PLFM-2698
PLFM-2698
PLFM-2698
PLFM-2698
Merge pull request #1215 from brucehoff/PLFM-2698

Plfm 2698
Merge remote-tracking branch 'upstream/develop' into PLFM-2717

Conflicts:
	client/synapseJavaClient/src/main/java/org/sagebionetworks/client/SynapseClient.java