Merge branch 'ldt' into develop

CMakeLists.txt

build_configs/buildconfig_arch

build_configs/buildconfig_arch_static

build_configs/buildconfig_bc2_locallibs

build_configs/buildconfig_bc2_static

build_configs/buildconfig_bc2_static_locallibs

cmake_support/OST.cmake

modules/base/pymod/CMakeLists.txt

modules/config/CMakeLists.txt

modules/config/config.hh.in

modules/conop/pymod/CMakeLists.txt

modules/conop/pymod/export_builder.cc

modules/conop/src/builder.hh

modules/conop/src/heuristic_builder.cc

modules/conop/src/rule_based_builder.cc

modules/conop/src/rule_based_builder.hh

modules/conop/tests/test_heuristic_builder.cc

modules/conop/tests/test_rule_based_builder.cc

modules/db/src/CMakeLists.txt

modules/geom/pymod/CMakeLists.txt