NXCM-5433: Undo 5ee2d0741d533e05761e2b74bf1a7ecbf98bf9af

Attributes will (again, as were since 2.0) go in trash along with content.

Original commit (manually reverted due to formatting changes, was conflicting)
5ee2d0741d533e05761e2b74bf1a7ecbf98bf9af

Original pull:
https://github.com/sonatype/nexus-oss/pull/81

Issue
https://issues.sonatype.org/browse/NXCM-5433

CI
https://bamboo.zion.sonatype.com/browse/NX-OSSF30