Merge pull request #14139 from anilmaurya/master

[ci skip] updating active_record/associations to demonstrate where conflict with eager loading.