cherry pick boilerplate cleanup
fix merge conflicts in boilerplate simplification
conflicts
bring in more boilerplate simplification
further boilerplate simplification
simplify, simplify said Thoreau
fixes to boilerplate to include correct links
(cherry picked from commit 8d1cc625061df9de64d993c16d5af294ae6fc198)