Github-Pull: #7335 Rebased-From: 7777994846
7777994846
* move non-test classes to subdir `test-framework`