Merge pull request #15329 from mattwire/contributepagetab_cleanupstatic