Merge branch 'release/roxy/master' into roxy-sync

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