Fix activemodel CHANGELOG
Merge branch '3-2-14' into 3-2-stable
Fix actionpack CHANGELOG entry

It was included by git on the wrong release
Fix merge error when Equality LHS is non-attribute.

This is reworking of rails/rails/pull/7380 made for rails 3.