Fix lockfile speed issues
Force locked_version on version_constraint
Fix merge conflict
Fix named source
Fix missing source => dependency
Fixing failing cucumber features