Merge pull request #11741 from Karunakar/failing_test_in_local

fix for postgresql failing test in local
Merge pull request #11712 from atambo/activesupport_testing_isolation_jruby

Fix ActiveSupport::Testing::Isolation on jruby
Merge pull request #11738 from gaurish/guides-association-basics-fix

[Fixes #11734]Correct Association Basics Guide on has_and_belongs_to_many

[ci skip]
Merge pull request #11733 from iainbeeston/master

i18n guide update: corrected reference to activerecord to instead reference activemodel
Conflicts:
	guides/source/i18n.md

[ci skip]
Revert "Merge pull request #11712 from atambo/activesupport_testing_isolation_jruby"

This reverts commit ff2091071bfa600ac93ad2b5a591355ce43abbf1.

Needs more work on 4-0-stable to make these tests work with JRuby