#904012 by helmo, mig5 - abstract AEGIR_DIR in UPGRADE.txt. Also some version-specific re-shuffling and wordiness