fix flakey test depending on json ordering
fix most railties tests; make Rails.metals order deterministic

Conflicts:
	Rakefile
	railties/test/gem_dependency_test.rb
Backportet fix: Escape the unit value provided to number_to_currency

Fixes CVE-2013-6415
backport deep_munge
Backport: Deep Munge the parameters for GET and POST

Fixes CVE-2013-6417