Fix the skip code.

Checking for the constant doesn't work
atomicc.rb: Don't assume we may chown/chmod a file.

Previously this code just assumed it is capable of changing the file
ownership, both user and group. This will fail in a lot of scenario's
unless:
* The process is run as a superuser (root);
* The owning user and group are already set to the user and group we're
  trying to chown to;
* The user chown'ing only changes the group to another group it is a
  member of.
If either of those conditions are not met the filesystem will simply
deny the operation throwing an error.

It is also not always possible to do a chmod, there might be a SELinux
policy or another limitation preventing the user to change the file
mode. To this end the chmod call has also been added to the rescue
block.

I've also added a little comment above the chmod command that doing a
chmod on a file which has an ACL set will cause the ACL to be
recalculated / modified.
Merge pull request #8027 from daenney/master

Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error.
Merge pull request #7587 from elia/fix-too-eager-loading

Should not eager_load app/assets
Conflicts:
	railties/CHANGELOG.md
Add test to deprecation of Path#children
Fix deprecation message in test for Path#children
Provide a call stack for deprecation warnings where needed.

It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly.
Merge pull request #8063 from nikitug/deprecation_caller_context

Provide a call stack for deprecation warnings where needed.
Fix failing tests and use new hash style in deprecation messages
Add test for code change introduced in this commit f20032f
Merge pull request #8066 from cfabianski/AddTestForSerializationMethod

Add test for code change introduced in this commit f20032f
Fix bug when Column is trying to type cast boolean values to integer.

This can occur if the user is using :integer columns to store boolean
values. Now we are handling the boolean values but it still raises if
the value can't type cast to integer and is not a boolean. See #7509.

Fixes #8067.

Conflicts:
	activerecord/CHANGELOG.md
Remove not assigned variable warning from sqlite3 adapter test
Make caller attribute in deprecation methods optional
Merge pull request #6107 from gazay/make_caller_attribute_in_deprecation_optional

Make callstack attribute optional in AS:Deprecation
include_root_in_json allows inheritance.
Merge pull request #8072 from kennyj/remove_mattr_include_root_in_json

Allow include_root_in_json to be inheritable by using the class_attribute created by Active Model serialization module.
Revert "The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now."

This reverts commit 7b290ad13c294005db062e746f8b79c8a192e4fa.
debugger gem is now working ok with p286
Revert "Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.foo(*args).deliver`."

This reverts commit 7e0cf563639bc7508da381b1b8321c7a89be1aa8.

Conflicts:
	actionmailer/CHANGELOG.md

See discussion at
https://github.com/rails/rails/commit/7e0cf563639bc7508da381b1b8321c7a89be1aa8#commitcomment-2075489
Fix #6951. Use query cache/uncache, when using not only database.yml but also DATABASE_URL.