TRUNK-4331: Additional edits to CONTRIBUTING.md

Further edits based on feedback from Burke and "Using Git" wiki page.