Moved role constraints into model and removed edit deployment
Merge pull request #329 from tboerger/feature/constraint-move

Moved role constraints into model and removed edit deployment
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).

(cherry picked from commit 0a05de3e61e9b9ad655a50e5fb13d2c4b9b862ca)
Removed the single assignment block from constraints

(cherry picked from commit 0d3754a9294eee3ba4474d8bb3d785f43b7d5d19)
Merge pull request #333 from vuntz/release/stoney/master

Sync with roxy
use neutron dhcp_domain in nova.conf (bnc#865733)

(cherry picked from commit ed372138b2d942f303d8da10e1121a594c2afaba)

Conflicts:
	chef/cookbooks/nova/recipes/config.rb
Merge pull request #334 from vuntz/release/stoney/master

use neutron dhcp_domain in nova.conf (bnc#865733)