Making test accurately reflect what is going on in the schema migrations test
Accept symbols as #send_data :disposition value
Use 1.8 hash style in pg specific schema
Work around undiagnosed bug that's draining a relation's bind_values
Merge pull request #8327 from elia/fix-send-data-disposition-with-symbols

Accept symbols as #send_data :disposition value
Merge pull request #7689 from cbarton/assume_migration_version_with_prefix_fix

Fixing a schema:load when using a prefix and suffix on the tables [Reopen/backport]
Merge pull request #8352 from steveklabnik/update_7858

Specify type of singular assication during serialization
Conflicts:
	activemodel/CHANGELOG.md
	activemodel/test/cases/serializers/xml_serialization_test.rb
Backport 78b30fed9336336694fb2cb5d2825f95800b541c to fix non-utf-8 databases mistakenly getting utf8 collation
Fixed description for ActiveSupport::Concern typical case
Merge pull request #8380 from route/fix-concern-description

Fixed description for ActiveSupport::Concern typical case
Merge pull request #6397 from kennyj/fix_translate_exception

Fix a problem of translate_exception method in a Japanese (non English) environment.
Make the CHANGELOG consistent [ci skip]
Use 1.8 hash style in xml serialization test
Merge pull request #8402 from senny/8376_descriptive_error_message_for_partial_layout_true

More descriptive error when rendering a partial with `:layout => true`
Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_view/renderer/partial_renderer.rb
handled respond_to? with private methods
Merge pull request #8405 from hsbt/fix-respond-initialize-dup

Handle respond_to? with private methods
Override <%== to always behave as literal text rather than toggling based on whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged.

Conflicts:
	actionpack/test/template/template_test.rb
Use 1.8 hash style
Skip ruby-prof in Gemfile for Ruby 2.0
Use send in Time marshal extensions since the methods are now private

See https://github.com/ruby/ruby/commit/9c1b3161f20162dc1682d758c0e4d2fc3a74745e

All Active Support tests pass in 2.0.0preview2 after this change.
Closes #8409