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