Update nova python files to include versions that match our packages.
Merge pull request #92 from galthaus/pull-req-release-betty-master-e8006d7025

Merge nova code that we replace in-line with our packages. [1/1]
Merge branch 'release/betty/master' into release/fred/master
Make Fred build ruby 1.9 compatible