Added check to see if parent was in trash when restoring.
Added ParentInTrashCanException.
Added test and check new parent in trash on restore.
Made the ParentInTrashCanException.
parent in trash can exception.
Made the exception for restoring.
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 branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into PLFM-2903
Merge pull request #1432 from brucehoff/PLFM-2903

Plfm 2903
Merge pull request #1429 from marcel-blonk/PLFM-2910

make partsMask optional and fix documentation