Comment 9 for bug 1390138

I rebased all your changes against present master and rel_2_7 (there was some minor conflicts due to drift from your collab vs. the main branches).

I also changed the upgrade path slightly to clarify the renamed file in newer versions and removed references to Ubuntu 10.04 Lucid because that is not a supported OS.