Add more packages to jenkins test.
Fix buildout with another bootstrap.py.
Merge remote-tracking branch 'upstream/master'
don't fail if old_path is None