make sure both headers are set before checking for ip spoofing
Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails into tamird-fix-ip-spoof-errors
Add changlog entry for #10844
Make `.next_migration_number` reusable for third party AR generators.