Defunct package due to inability to merge source branches rendered unusable by multiple trunk merges into what should otherwise be trivial changes.
So we opt to re-create the offending source branches relative to NEMO vn3.6 and then create a new package branch from those.