Adapt to latest libcppmanip changes
Merge remote-tracking branch 'mcencora/master'
UT cmakelists cleanup