PLFM-2901

This was the fix to the issue of allowing an entity in the trash to be restored to a parent that is also in the trash.

Note: A bunch of the changes on "TrashManagerImplAutowiredTest.java" can be ignored, as they're just whitespace stuff that were the result of an accidental "replace all" call I made. Sorry about that.