Merge pull request #10033 from kalabiyau/fix_typo_on_ap_mime_types_test

Fixed typo on AP dispatch Mime::Type test
:scissors:

[ci skip]
Throwing a RecordNotFound exception when a record is scanned using the
inverse_of option. I've also refactored the code for raising a
RecordNotFound exception when searching for records with ids.
Merge pull request #10022 from wangjohn/find_on_nonexistent_id_raises_error

Throwing a RecordNotFound exception when a record is scanned using the inverse_of option
Revert more Rails.version changes

Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc
Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184a
Updated the error message for +find+ on an inverse_of association
so that it is consistent with the error thrown for +find+ without an
inverse_of association.
Merge pull request #10036 from wangjohn/norecord_error_message_consistency_issues

Updated the error message for find to stay consistent across Rails
Revert "Use jquery-rails from github (fix Gem::Version error)"

This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980.
Revert "Use jquery-rails from github"

This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8.

Conflicts:
	railties/lib/rails/generators/app_base.rb
change merge to merge! in AS on new hashes
Added missing assert
Merge pull request #10042 from choudhuryanupam/fix_activesupport_test

Added missing assert
Merge pull request #10041 from vipulnsward/more_destructive_merge

change merge to merge! in AS on new hashes
Use released sdoc
Fix #new with an STI object with complex inheritance
Merge pull request #10038 from nateberkopec/sti-new-with-complex-inheritance

Fix regression re: #new with an STI object & complex inheritance
replace #merge with relation API calls in calculations_test.
Merge pull request #10048 from senny/replace_merge_with_relation_calls_in_count_api

replace #merge with relation API calls in calculations_test.
Merge pull request #131 from lazylester/master

Edge rails new syntax for importing engine migration