Fix concurrent issue
Merge branch 'master' into Issue2541
1. fix tests
[2627]Action tests failing due to new variable in getLogMessage

fixes #2627
Merge branch 'master' into Issue2541
[2541] Fix concurrent issue in displaying search results
Merge branch 'master' into Issue2623