Revert "[440013] JUnit failures in CBI Build R3_6_Maintenance - get more information from test; only fails remotely" This reverts commit b614e38a974e65d83dff4e3c81bf180d7079b5b9. This reverts commit 144375a8fa43eef790c1d20d2aa22ba1172e9670. This reverts commit 9a30bc5055aae29c8fc30d0dbf1da2b2b45e8df1. This reverts commit 5bb3abdd96ffe6a71b8d969ef3c0b87860b5ae4e.