Merge pull request #4923 from jordan-brough/fix-order-reload

fix Order#reload method signature

Conflicts:
	core/spec/models/spree/order_spec.rb