Merge pull request #1245 from brucehoff/PLFM-2742

PLFM-2742
PLFM-2735
PLFM-2735
PLFM-2735
Merge pull request #1249 from brucehoff/PLFM-2735

Plfm 2735
Merge branch 'release-41' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge pull request #1250 from brucehoff/develop

Develop