Removing metrics2 usage from TraceReaderTest
Adding jdk7 support for DelegatingConnection