set the configured #inheritance_column on #become (#7503)

I had to create a new table because I needed an STI table,
which does not have both a "type" and a "custom_type"

the test fails with:
  1) Error:
test_alt_becomes_works_with_sti(InheritanceTest):
NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber">
    /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing'
    /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing'
    /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes'
    test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti'
    test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti'

Conflicts:

	activerecord/test/cases/inheritance_test.rb
Merge pull request #7514 from senny/issue_7503_3_2_stable

set the configured #inheritance_column on #become (#7503)
Merge pull request #7337 from adzap/string_to_dummy_time

Fix for time type columns with invalid time value
Conflicts:
	activerecord/CHANGELOG.md
Update Active Model xml serialization test to reflect a change in builder

Due to a change in builder, nil values and empty strings now generates
closed tags, so instead of this:

    <pseudonyms nil=\"true\"></pseudonyms>

It generates this:

    <pseudonyms nil=\"true\"/>

Document this change in Rails so that people can track it down easily if
necessary.

Conflicts:
	activemodel/CHANGELOG.md
Fix AR tests due to builder change with nil values / empty strings

Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about
that.
Fix AS tests due to builder change with nil values / empty strings

Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about
that.
ConnectionAdapters::Column.type_cast_code should always convert values to integer calling #to_i
Merge pull request #7582 from tchandy/fix_type_cast_code

type_cast_code should always convert values to integer calling #to_i
Backported #7572 to 3-2-stable. Use config['encoding'], because database configuration use not charset but encoding.
Merge pull request #7603 from kennyj/fix_charset_vs_encoding_32

Backported #7572 to 3-2-stable. Use config['encoding'], because database configuration use not charset but encoding.
Backport PostgreSQL auto-reconnect test coverage

6d5f4de4c420ebb906109668f5702a537ac77692
Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.

4b1bca04025a66c54e6e9d5eb6e4d4056bfa92f0
Stop being silly with formatting of method aliasing.

c381d5cbf959208adeb38e7859ee815dfbd2cf54
Fix just-plain-wrongness of psql auto-reconnect test.

1e17a9d367c54c680368be72f44247ae28b98904
Fix only-once stub logic.

f16c2043826ec1991cf94fe17cb671507b7a7f51
Changelog for PostgreSQL auto-reconnect test coverage backport.
Merge pull request #7632 from stevecj/3-2-stable

3 2 stable
fix markdown markup in AR/CHANGELOG
Merge pull request #7633 from frodsan/patch-5

Fix markdown markup in AR/CHANGELOG [ci skip]
`skip` in Ruby 1.8 doesn't skip the test case without return
Backport explain fixes.

* Mark as SCHEMA some schema database queries. #7648
* Don't explain queries except normal CRUD sql. #7657

Closes #6458
Closes #7544
Merge pull request #7651 from steveklabnik/issue_3956

Don't preserve SELECT columns on COUNT

Closes #7651

Conflicts:
	activerecord/test/cases/associations/has_many_associations_test.rb
Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b23835665

Fix warning: method redefine. Testcase name are duplicated.
Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt

Fix collection= on hm:t join models when unsaved
log 404 status when ActiveRecord::RecordNotFound was raised (#7646)

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_controller/log_subscriber.rb