(PUP-3604) Rework handling of :ensure with a version

Do we have a test case for where we have both a use_version and flavor?