Manual sweep from 21.0 to 21.0-mc16a: Remove project-dependent code (ATR-15697) and some cleanup

John Derek Chapmanrequested to merge
cherry-pick-6714bfbb into 21.0-mc16a

Former-commit-id: 98dbfb39

(cherry picked from commit 6714bfbb)

See discussion in: ATR-22166

Edited by John Derek Chapman

Merge request reports