Cleanup fixup.
	- VM instance cleanup steps are skipped, if VM instance was deleted before cleanup.
	- Line 639: Nova delete argument changed from "Instance name" to "Instance id".
	- Line 647: Nova volume-delete argument changed from "Volume name" to "Volume id", deletion is performed only if this volume still exists in moment of performing "volume-delete".
Merge pull request #288 from MirantisDellCrowbar/bug/smoketest_cleanup_fix/release/roxy/master

Cleanup fixup.
Move lock_path to /var/run

/var/lock is blacklisted on openSUSE
Merge pull request #305 from dirkmueller/cleanup_lock

Move lock_path to /var/run
fix erroring in smoketest
Merge pull request #312 from jdsn/fix-smoketest-erroring-roxy

fix erroring in smoketest
Bringing back datastore attribute for Havana
Merge pull request #309 from mjura/release/roxy/vmware-datastore

[roxy] Bringing back datastore attribute for vmware
Generate a node-specific UUID

Certain batches of Dell and IBM hardware seems to
have the same hardware product UUID. As libvirtd
requires a globally unique identifier for live
migration, lets create one on our own.

(cherry picked from commit d886aa52122ce04bfea0820ea35d746ec492e9ad)
Make sure that the right ssh public key is saved in the node info

The old way of saving the node public key relied on a notification, and
so only happened the very first time, when the ssh key was created. If,
for any reason, this went wrong, then there was no way to get it fixed.

Instead, on each chef-client run, we check if the node info contains the
right data, and if not, we save it.

(cherry picked from commit b5b7899f50f93273671886f67151615be365b209)
Recreate ssh keys if we somehow lost the private key

(cherry picked from commit 2af4b2ff987e42e49b9d7925ca81fda812e96121)
Merge pull request #318 from dirkmueller/release/roxy/master

Generate a node-specific UUID
Update for recipe name after neutron cookbook code reorg
Only read ssh public key if file exists

(cherry picked from commit 353ad5caf8d058a3ccd31edd306f3fbe08297953)
Merge pull request #320 from vuntz/ensure-ssh-key

Make sure that the right ssh public key is saved in the node info
Merge pull request #324 from vuntz/neutron-reorg

Update for recipe name after neutron cookbook code reorg
use neutron dhcp_domain in nova.conf (bnc#865733)
Drop custom version of search_env_filtered

It's now available in the utils cookbook, and having the two versions
create a conflict (with one overloading the other).
Moved role constraints into model and removed edit deployment

(cherry picked from commit 0c038e58785c0517908855b8725db8fcffe38abb)
Merge pull request #331 from vuntz/release/roxy/master

Moved role constraints into model and removed edit deployment