Remove default cmake INSTALL and EXPORT commands from common.cmake
Re-enable usage of common.cmake now that it is fixed
Fix broken merge