Merge pull request #526 from brucehoff/SWC-651

SWC-651
fix for SWC-651
SWC-651
Merge branch 'release-2' into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge pull request #533 from brucehoff/develop

merge release-2 changes into develop
added JSON schema for new Annotations objects