Merge "StructureTest::testUnitTestFileNamesEndWithTest() should not shell out"