Squashed 'lib/cpp-library/' changes from 04d6fc6..1a363c8
Squashed 'lib/cpp-library/' changes from 04d6fc6..1a363c8

1a363c8 minor cleanup

git-subtree-dir: lib/cpp-library
git-subtree-split: 1a363c84331ba02aa2b3a49b47829a12e4fb8854

swillner/disaggregation,swillner/libmrio