Merge proposals dependent on lp://qastaging/~james-page/ubuntu/oneiric/nova/fix-new-installs

1. Oneiric (11.10)
2. fix-new-installs
3. Dependent merge proposals