Revert "remove versioned ettercap conflict: no longer exists, so just conflict"

This reverts commit fbd0d8a5355ffe7a6a17b7bb8cf01c1e00b0bb46.
Update copyright file
wrap-and-sort
Preparing for new release