Wishlist updates proposed in Magento 2 Commerce PR (internal)

[DrewML]

Based on issue discovered in https://github.com/magento/partners-magento2ee/pull/248.

There is a separate PR with some of the work.

Proposal was approved by @nrkapoor and @fnhipster, but sending through the proper channels for review.

• Comment summarizing the problem this PR attempts to solve
• Comment where revised solution is presented

[nishant]

I believe you mentioned the wrong user as I have no connection to this repository

[DrewML]

Whoops - sorry about that @nishant!