Conflicts:
	ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue
	ee/app/assets/javascripts/vulnerabilities/components/history_comment_editor.vue