Ironic api-endpoint uses port 6385

The Ironic api_endpoint value in nova.conf (ironic section) is incorrectly
set to port 6358. This sets it to the correct port: 6385.

Change-Id: Ic591588e3480cc25c6e276f11103b7b0007d642a
Closes-Bug: #1297939
Install qemu-kvm instead of kvm package on Ubuntu

Since at least 12.04, the kvm package is a transitional dummy
package intended to move users to the newer qemu-kvm package.  This
removes the dependency on this dummy package, which will be going away
in 14.04, and instead depends on the proper qemu-kvm package.

Change-Id: I4a88ada3cf32106413a9fae6fe77c9c4c28a524e
Closes-bug: #1294557
Merge "Ironic api-endpoint uses port 6385"
Merge "Install qemu-kvm instead of kvm package on Ubuntu"
Fix Neutron plugin XTRACE handling

The various Neutron plugin files need to have unique variables for the
xtrace state as they are sometimes nested more than two levels deep
and MY_XTRACE is getting stomped.  This gives each of the neutron_plugin
and neutron_thirdparty include files a unique XTRACE state variable.

I don't think this is a problem with any of the other plugin include
files (yet) so this just handles Neutron for now.

Change-Id: I7c272a48e7974edecaff5f431ff7443dd6622588