test for 8018
do not install ruby-prof on Ruby 2.0
Update xml serialization tests to reflect a change in builder

Due to a change in builder, nil values 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.

Changes in Active Model, Active Record and Active Support tests.

Cherry-pick of d65adc7, 77dd3be and 146eaf3. Fix build.
Be a bit less conservative with mysql in adapter

This will allow the new mysql 2.9.0 to be used, fixing our test issues.
updating changelogs
CVE-2012-5664 options hashes should only be extracted if there are extra parameters
bumping version to 3.1.9
Avoid Rack security warning no secret provided

This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie."
* Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu

Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.
bumping version
Fix a few warnings of unused variables
Remove test for XML YAML parsing

The support for YAML parsing in XML has been removed from Active Support
since it introduced an security risk. See 8133a81 for more detail.
Merge pull request #8835 from sikachu/3-1-stable-fix-ars

Remove test for XML YAML parsing
Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable