Merge and other changes for AR 2.1.2

git-svn-id: http://svn.castleproject.org:8080/svn/castle/ActiveRecord/branches/2.x@6726 73e77b4c-caa6-f847-a29a-24ab75ae54b6

Merging trunk revisions 6590 - 6620

git-svn-id: http://svn.castleproject.org:8080/svn/castle/ActiveRecord/branches/2.x@6621 73e77b4c-caa6-f847-a29a-24ab75ae54b6

Removed fluent configuration spike intended for 3.0 only.

git-svn-id: http://svn.castleproject.org:8080/svn/castle/ActiveRecord/branches/2.x@6565 73e77b4c-caa6-f847-a29a-24ab75ae54b6