Bug 842334 - Move distribution/ back to the installation directory. r=bsmedberg,r=gavin