NEXUS-6537: Backport of master

Original PR
https://github.com/sonatype/nexus-oss/pull/553
Merge pull request #559 from sonatype/nexus-2.9.x-NEXUS-6537-fs-move

[2.9] NEXUS-6537 Backport