Merge pull request #16075 from nickpellant/master

Fix ActiveSupport::Callbacks #set_callback docs.
Add callbacks documentation for upgrading to 4.1.

It is now expected in 4.1 to use an explicit block rather than implicit
when setting callbacks through ActiveSupport::Callbacks. This commit
highlights this new expectation as part of the upgrading documentation.