Make it possible to distinguish the latest master from 3.1.6 before making any changes. Closes #22282.