[Merge][CMake] Merged revisions : 6691

Revision  r6691
.----------------------
Do not set CMAKE_FIND_LIBRARY_SUFFIXES as it is not needed here and
breaks some tests afterwards.

.----------------------


[[Imported from SVN: r7211]]