Revert "Revert "Inspired by the recent commit from @ceedubs [1] which adds xmap to Choose, this""

This reverts commit 54e9d8179f5405720f73b83c68ae3177b6990c61.
Manually cherry-pick relevant changes from master

(cherry-picked from 0f0367ba0d7af6c70196b159b89c9a76c95c1079)
ScalaCheck 1.11.6 release