* master:
  adding more callback type coverage

* master:
  extract getting an setting callbacks to methods
  call extracted method from callback manipulation methods
  extract callback param munging
  no reason to make these defaulted, we always pass values in

Conflicts:
	activesupport/lib/active_support/callbacks.rb

* master: (61 commits)
  add tests for reset_calbacks
  Fixing build broken by this change
  Extract variable out of loop
  Updated comment to Rails 4
  Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext
  better error message when app name is not passed in `rails new`
  Code cleanup for ActionDispatch::Flash#call
  Fix typo: require -> requires
  Add CHANGELOG entry for #10576
  Merge pull request #10556 from Empact/deprecate-schema-statements-distinct
  Some editorial changes on the documentation.
  respond_to -> respond to in a message from AM::Lint
  specify that dom_(id|class) are deprecated in controllers, views are fine
  copy edits [ci skip]
  Fix class and method name typos
  Replace multi_json with json
  ruby -> Ruby
  Adding documentation to the automatic inverse_of finder.
  Improve CHANGELOG entry [ci kip]
  Call assume_migrated_upto_version on connection
  ...

Conflicts:
	activesupport/lib/active_support/callbacks.rb

Fixing build broken by this change

c43ca06c

Extract variable out of loop

Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext

Updated comment to Rails 4

* Each file that uses `alias_method_chain` brings it in explicitly

better error message when app name is not passed in `rails new`

Prior to this change, for the following command:

    $ rails new

we received "Options should be given after the application name" as an error message.

This is outdated and should be "Application name should be provided in arguments".

Code cleanup for ActionDispatch::Flash#call

The nested `if` was replaced by using `presence` which takes account for
the given hash when it is `nil` or when it is empty. The `else` was
removed because what it was doing was to assign to `env[KEY]` the
value it already had.

Fix class and method name typos

Remove jruby-openssl from default Gemfile

[ci skip]

[ci skip]

Deprecate SchemaStatements#distinct, and make SchemaStatements#columns_for_distinct nodoc.
Conflicts:
	activerecord/CHANGELOG.md

* Remove some autolinks
* Fix the rendered result
* Change sql to SQL

[ci skip]

The error message uses English to say that the object should respond
to a certain method. You check that with respond_to, but that's not
English.

This makes this error message also consistent with the rest.

Conflicts:
	activesupport/lib/active_support/callbacks.rb

Replace multi_json with json

Adding documentation to the automatic inverse_of finder.