#18472 Changed layout of fieldsets in settings to two columns
Merge branch 'i18472' into development

Conflicts:
	app/views/settings/_usability.html.erb