CGM had been dropped, remove special handling from TKService/CMakeLists.txt
Bump OCE_ABI_SOVERSION to 7
Add chunks from the review/OSX-Cocoa-support which are still needed