Merge branch 'f-consolidation' of...

Merge branch 'f-consolidation' of gitlab.indiscale.com:caosdb/src/caosdb-cpplib into f-consolidation