Making CMake lists unique for generated configuration files
Fixing security related merge problem.