hg: jigsaw/jake/jdk: Fixup merge issue

[mandy . chung]

Changeset: a0f2a493ec38
Author:    mchung
Date:      2016-08-19 21:58 -0700
URL:       http://hg.openjdk.java.net/jigsaw/jake/jdk/rev/a0f2a493ec38

Fixup merge issue

! test/com/sun/corba/transport/KeepAliveSockets.java
! test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java
! test/sun/rmi/rmic/classpath/RMICClassPathTest.java
! test/sun/security/util/Resources/NewNamesFormat.java