Merge pull request #1236 from brucehoff/develop

Develop
Preserve parentId + test
Fix
check
switched to transaction template
Merge pull request #1238 from john-hill/PLFM-2602

Plfm 2602
fixed
PLFM-2681: Skip items in trash can when searching by md5.
new exception type
Merge pull request #1239 from john-hill/PLFM-2679

fixed
Merge pull request #1240 from john-hill/PLFM-2680

new exception type
Merge pull request #1237 from xschildw/PLFM-2727

Preserve parentId + test
PLFM-2710: Do not show favorites in the trash can.
Remove system.out.println().
Merge pull request #1241 from eric-wu/develop

PLFM-2681, PLFM-2710
No idea why it passed on local, delete attachment instead of adding. Passes on local.
Missed assert
Merge pull request #1242 from xschildw/PLFM-2727

Plfm 2727
PLFM-2728
PLFM-2728