Restore Java 1.5 compatibility
All code changes are marked with Java 1.6 so can easily be found later
@Overrides are commented out rather than removed (easier to do global replace)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/trunk@1489361 13f79535-47bb-0310-9956-ffa450edef68