BS-7938 : Merge master in the branch of log enhancement

- Fix JoBoss tests