Merge pull request #14539 from lparedes/master

Do not overwrite selected and disabled attributes
Conflicts:
	actionpack/lib/action_view/helpers/form_options_helper.rb