Merge pull request #23459 from edbratt/master

A few cleanup changes and 6.0 Platform and Web Profile TCK summaries