v.21.1Build/Testing/Packaging Improvements

Automated Check for Conflict Markers in Documentation

Automated check for leftovers of conflict markers in docs. #18332 (alexey-milovidov).