Removed unused loop variable
Removed unnecessary block
When we pass id to update_attributes it will try to set new id for that record
Merge pull request #9707 from route/updates_another_record

When strong_parameters had been included, this case of update became possible
StringIO is not required by default in JRuby
test-case to prevent resetting associations when preloading twice.

Conflicts:

	activerecord/lib/active_record/associations/preloader/through_association.rb
	activerecord/test/cases/associations/eager_test.rb
Merge pull request #9872 from senny/test_case_to_prevent_unnecessary_reset

test-case to prevent resetting associations when preloading twice.
Don't kill the console

Use the "quit" command instead. This seems to prevents some weirdness on
OS X. See #9761.
Merge pull request #9871 from arunagw/stringio-require-jruby

StringIO is not required by default in JRuby
Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_test

Removed unnecessary block
Merge pull request #9866 from choudhuryanupam/fix_connection_test

Removed unused loop variable