Merge pull request #428 in CASA/casa6 from CAS-13571 to master
* commit '277313dee8cde6ad8b5573d78e6a4d0f2188c402':
CAS-13571 workaround for multiple log files being created in the Casa 6 Casa5 Subtree Pull Request bamboo plan
CAS-13571 synchronizing changes from casa6 to casa5 (originally from CAS-13314)