Fix log message for unreferenced variable

Fixed bug 1091664

Change-Id: I83110fd8d05d8a5168cbc21ce78c3c44d01c7ae1
prevent deletion of router interface if it is needed by a floating ip

bug 1081325

Change-Id: I33495fd7ee812eded015b2d3783d1cf6a3bf14bc
Add OVS cleanup utility

Fixes bug 1091605

The utility should be called after rebooting an appliance. This
will purge the openvswitch of configured tap devices.

A configuration variable quantum_ports has been added. This is
by default True which indicates that only Quantum ports will be
deleted from the OVS. If this is set as False then all ports on the
bridge will be deleted.

Change-Id: I442f64cf82f95bfa99d7765eb09db1ce2ecf602e
Merge "Add OVS cleanup utility" into stable/folsom
Merge "Fix log message for unreferenced variable" into stable/folsom
Ensures that the dnsmasq configuration file flag is always set

Fixes bug 1094183

If the flag is not set then the default configuration file may
be used. This may be problematic in certain setups.

Change-Id: Ibd0be960779f391a198454510dd6edcbc69c149c
Merge remote-tracking branch 'openstack/stable/folsom' into folsom/master
Merge pull request #2 from nbartos/folsom/master

Merge from upstream openstack/stable/folsom