Merge pull request #33 from dirkmueller/release/stoney/master

Use api-paste.ini from the packages
Do not refer to Heat as OpenStack Orchestration

http://lists.openstack.org/pipermail/openstack-dev/2014-February/026323.html
Merge pull request #34 from vuntz/naming

Do not refer to Heat as OpenStack Orchestration
Merge pull request #35 from crowbar/release/roxy/master

Sync with roxy
remove openstack- prefix from user/group for SUSE

Make this more uniform accross distributions.
Fix typo

Apparently unused, otherwise it would have never worked
Merge pull request #37 from dirkmueller/release/roxy/master

Fix typo
Merge pull request #36 from dirkmueller/no_prefix

remove openstack- prefix from user/group for SUSE
Fix to work when keystone is behind haproxy
Use new helpers to get hostnames for endpoints
Moved role constraints into model and removed edit deployment
Merge pull request #41 from tboerger/feature/constraint-move

Moved role constraints into model and removed edit deployment
Moved role constraints into model and removed edit deployment

(cherry picked from commit bdf3e3bed88227fe74fb1f046e572a0a1c3487a6)
Merge pull request #42 from vuntz/release/roxy/master

Moved role constraints into model and removed edit deployment
Removed the single assignment block from constraints
Merge pull request #43 from tboerger/feature/roxy/fix-constraints

Removed the single assignment block from constraints
Removed the single assignment block from constraints

(cherry picked from commit 7ab174e91c82153678c1e6c33e590be8b695d110)
Merge pull request #44 from vuntz/release/stoney/master

Removed the single assignment block from constraints
Merge pull request #39 from vuntz/haproxy

Work with keystone behind haproxy
Merge branch 'release/roxy/master' into roxy-sync

Conflicts:
	chef/cookbooks/heat/attributes/default.rb
	chef/cookbooks/heat/recipes/server.rb
	chef/cookbooks/heat/templates/default/api-paste.ini.erb