FindIce: Synchronise with upstream next branch

This has been merged into the cmake upstream next branch for testing.  No functional changes, just minor cleanup.  If the build and tests pass, it's ready to move onto their master branch.

--no-rebase

--------

Testing:

jobs should remain green