Add libvirt_cpu_mode/libvirt_cpu_model attributes
Fix incorrect attribute check
Merge pull request #373 from mattt416/add_libvirt_cpu_attributes

Merged automatically by jenkins after successful build test
Add favicon to novncproxy
Merge pull request #357 from odyssey4me/novncproxy-favicon

Add favicon to novncproxy
Fix for issue 754

Renamed "nova.comf" to "nova.conf" in configuration file list.
Merge pull request #374 from cloudnull/issue754

Merged automatically by jenkins after successful build test
Add HA bits for OS metadata service
Merge pull request #375 from rackerjoe/nova-api-metadata

Merged automatically by jenkins after successful build test