Update CMake contrib library variable names.
Merge branch 'hotfixes' into develop