Update for base64 encoding and nodeid changes
Added minor update to CMakeLists.txt and removed CTestConfig.cmake.
Merge branch 'base64' into next