This is prep-work to landing CMake 3.17 -- something has changed in dependency handling, and the configure step fails. This is the last fall-out item before a new exp-run. PR: 245356