Merge pull request #26 from vuntz/prepare_role_for_ha

Add prepare_role_for_ha helper to PacemakerServiceObject
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