Get ready for external legacy test controllers
Merge pull request #6503 from kabir/pull-out-legacy-controllers

Get ready for external legacy test controllers