Merge branch 'new-vulnix' into 'develop'

Use a version of vulnix that doesn't collapse derivations with different sets of patches.

See merge request !196