add modal body helpers
conform to one expect per it
correct wording in test description
Merge branch 'staging' into 902-restrict_owner_degradation

Conflicts:
	config/locales/en.yml