we rely on readlink -f, which is not really cross-platform, but the
alternative is not supporting symlinks properly...

that way we do not need to check if the path is in the right directory
at all, we just remove the link, who cares if it points to a place
outside the site dir if we do not dereference it?

improvements;

 * we close directories as we go
 * coding style

This reverts commit b269e71a.

This reverts commit 321b1522.

Conflicts:
	aegir.make
	upgrade.sh.txt

Conflicts:
	aegir.make
	provision.info
	upgrade.sh.txt

hosting-resume doesn't exist in pre 1.0-rc4, so this fails during upgrades

we'll remove this once everybody hit at least 1.0-rc4 (or say 1.0)

hosting-resume doesn't exist in pre 1.0-rc4, so this fails during upgrades

we'll remove this once everybody hit at least 1.0-rc4 (or say 1.0)