Merge branch 'f-consolidation' into 'dev'

conanfile.txt

test/CMakeLists.txt

test/test_ccaosdb.cpp

test/test_connection.cpp

test/test_file_transmission.cpp

test/test_list_properties.cpp

test/test_transaction.cpp