Merge branch 'fix-discussions-on-changed-lines' into 'master'

Fix bug where notes weren’t shown in discussion when the code had changed after creation

See merge request !5908