Merge pull request #10636 from seanwalbran/fix-asset-host-proc-returning-nil

fix rails4 regression with asset_host Proc returning nil
Revert "Integration tests support the OPTIONS http method"

This reverts commit ad46884af567d6f8d6d8d777f372c39e81a560ba.

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_dispatch/testing/integration.rb
	actionpack/test/controller/integration_test.rb

Reason: It will conflict with a lot of test cases. Better to call
`process` directly since this is a very uncommon HTTP method.

Fixes #10638.
Corrected documentation regarding validation errors
Merge pull request #137 from zduci/master

Corrected documentation regarding validation errors
Raise when multiple included blocks are defined
Merge pull request #10619 from alno/top_level_array_in_postgres_json

Support array as root element in Postgresql JSON columns
Merge pull request #10594 from shime/rack-debugger

exit with non-zero to signal failure
Add more data to AR::UnknownAttributeError

begin
  Topic.new("hello" => "world")
rescue ActiveRecord::UnknownAttributeError => e
  e.record # => #<Topic ... >
  e.attribute # => "hello"
end
test refactor
Merge pull request #10527 from zenspider/squishy_minitest5

Squishy minitest5
Merge pull request #10652 from md5/concern-multiple-included

Raise an error when multiple included blocks are defined for a Concern
Revert "just call the class method since we know the callbacks are stored at the"

This reverts commit 55975c71ec9c2c18b67020484959ff5c69d4d3fb.
Fix named routing regression from 3.2.13

When named route that is nested is used in 3.2.13

Example `routes.rb`:

```
resources :nested do
  resources :builder, :controller => 'nested/builder'
end
```

In 3.2.12 and 3.2.12 this named route would work:

```
nested_builder_path(:last_step, :nested_id => "foo")
```

Generating a url that looks like `/nested/foo/builder/last_step`. This PR fixes the regression when building urls via the optimized helper. Any explicit keys set in the options are removed from the list of implicitly mapped keys.

Not sure if this is exactly how the original version worked, but this fixes this use case regression.
Mocha 0.14.0 was released with MT5 support. Switch back to gem
Merge pull request #10656 from zenspider/fix_mocha_back

Mocha 0.14.0 was released with MT5 support. Switch back to gem
let Ruby do the is_a check for us
Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong.
plugin new missing license spec

When bundling a gem created with
rails plugin new
Bundler outputs the following warning when building the gem:
WARNING:  licenses is empty

	modified:   railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
Merge pull request #10657 from AJ-Acevedo/plugin

plugin new missing license spec
"normalize_callback_params" doesn't require name param