fix erroring in smoketest
Merge pull request #311 from jdsn/fix-smoketest-erroring

fix erroring in smoketest
Merge pull request #313 from dirkmueller/release/stoney/master

Fix libvirt compute vif driver
Bringing back datastore attribute for Havana
Merge pull request #308 from mjura/release/stoney/vmware-datastore

[stoney] Bringing back datastore attribute for vmware
Do not overwrite api-paste.ini

That file comes from packages/upstream. The only remaining configurable
piece in there (keystone middleware) should be configured in nova.conf
meanwhile. Move configuration over.