Github-Pull: #7213 Rebased-From: 37d271d7cc
37d271d7cc
* move non-test classes to subdir `test-framework`