[MNG-4197] relocation doesn't work in trunk (rev 784345) Submitted by: Olivier Lamy o Applied with minor updates to account for recent refactoring