Merge branch 'hotfix-58-bfly3bug' into oai-iis-testbed-interop

cmake_targets/CMakeLists.txt

cmake_targets/autotests/010113/CMakeLists.txt

cmake_targets/autotests/010114/CMakeLists.txt

cmake_targets/autotests/010115/CMakeLists.txt

cmake_targets/autotests/010204/CMakeLists.txt

cmake_targets/autotests/010205/CMakeLists.txt

cmake_targets/autotests/010400/CMakeLists.txt

cmake_targets/autotests/010401/CMakeLists.txt

cmake_targets/autotests/010402/CMakeLists.txt

cmake_targets/autotests/010403/CMakeLists.txt

cmake_targets/autotests/015000/CMakeLists.txt

cmake_targets/autotests/015001/CMakeLists.txt

cmake_targets/autotests/015002/CMakeLists.txt

cmake_targets/autotests/015003/CMakeLists.txt

cmake_targets/autotests/015004/CMakeLists.txt

cmake_targets/autotests/015005/CMakeLists.txt

cmake_targets/autotests/015006/CMakeLists.txt

cmake_targets/autotests/015007/CMakeLists.txt

cmake_targets/autotests/015008/CMakeLists.txt

cmake_targets/autotests/015009/CMakeLists.txt