LDAP-258: General Java 5/6 cleanup throughout the code base.