fixes #13883 - replace :order association option with block

Already deprecated in an earlier Rails release, :order in an
association should be replaced by a scope block calling order().

(cherry picked from commit 3d2098bd472851ce4d030ff78adc30044eaa7d3b)