Split commit "1.6.7" to avoid inadvertent regressions

[tormodvolden]

The recent commit 9e15412 with the only message "1.6.7" reverted several previous commits, surely this was not the intention. It also contained several different changes that deserve to be highlighted, and some file changes that are not needed. Also one of the affected files doesn't need to be in the repository.

Instead of reapplying the lost commits, I believe it is cleaner if we simply revert this unfortunate commit, and then reapply the wanted changes from it in well-formed commits. This makes it easier to review and see what was changed.