Merge pull request #11020 from fredwu/master-activemodel-inclusion-chain-fix-iii

ActiveModel::Model inclusion chain backward compatibility