Merge pull request #4805 from xuanxu/none_and_null_object_pattern

Added `none` query method to return zero records.
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/querying.rb
Another fix