Add return_conflicts options to check_conflicts function and enhance tests#5000

Flamefire wants to merge 3 commits intoeasybuilders:developeasybuilders/easybuild-framework:developfrom

Flamefire:check-conflict-enhancementFlamefire/easybuild-framework:check-conflict-enhancementCopy head branch name to clipboard