Change OrdersController#populate to sync with spree/spree#4334

Reflects changes to #current_order arguments.