merge Cmake branch

Should not touch non-cmake files with one exception:

I've changed a few autotools tests (in tests/workgroup) lately, mostly to move expected output into separate files (so we dont have expected output twice - in each buildsystem)