resolve conflict on api helpers in cherry-pick

attempt to bring the following into 2-3-dev
https://github.com/spree/spree/pull/5233