Merge pull request #41 from vuntz/openstack-ra

Install openstack-resource-agents from crowbar-pacemaker cookbook
Fix definition of "params" attribute in the "primitive" resource
Merge pull request #43 from rhafer/fix

Fix definition of "params" attribute in the "primitive" resource
Merge branch 'release/roxy/master' into sync-roxy

Conflicts:
	crowbar_framework/app/helpers/pacemaker_barclamp_helper.rb
	crowbar_framework/app/views/barclamp/pacemaker/_edit_attributes.html.haml