catalyst: support ordering editions without requires

Change-Id: I8aae891c9096b0e9bc3aacb7ea13fcc7c43f76c8
catalyst: Extras comes after Enable-Python

Change-Id: I823c0c8ae6a945d507695b86f4403a7c82a7234d
Merge topic 'catalyst-edition-ordering' into next

862f7ac8 catalyst: Extras comes after Enable-Python
97a3fd0f catalyst: support ordering editions without requires