Add assertj-core in test dependencies
Merge branch 'master' into 'BS-6672_Log_enhancements'