Better organized elements for the Update UI

Ticket: #6300
Save "Automatically check for updates" when clicked

Ticket:	#6300
Merge remote-tracking branch 'origin/master' into freebsd10