Change hardcoded default to 20s.
Merge pull request #96 from xschildw/master

PLFM-1479
Merge branch 'release-1.7'
Merge branch 'release-1.12'
updated README.md
2 more cases from Cloudwatch
I had accidentally changed some other test's with a "replace all". Reverted to old labels.
whitespace fix stuff.
PLFM-2903
PLFM-2903
Changed a ParentInTrashCanException's httpStatus response to be a 403 FORBIDDEN instead of 404.
Merge pull request #1427 from toddis/PLFM-2901

PLFM-2901
PLFM-2903
PLFM-2903
make partsMask optional and fix documentation
documentation typos
Merge pull request #1430 from marcel-blonk/PLFM-2895

documentation typos
Merge pull request #1428 from brucehoff/PLFM-2903

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

Plfm 2903