Merge

jdk/test/sun/security/jgss/spnego/NotPreferredMech.java

jdk/test/sun/security/krb5/auto/Context.java

jdk/test/sun/security/krb5/auto/KerberosHashEqualsTest.java

jdk/test/sun/security/krb5/auto/NewInquireTypes.java

jdk/test/sun/security/smartcardio/TestAll.java

jdk/test/sun/security/smartcardio/TestChannel.java

jdk/test/sun/security/smartcardio/TestConnect.java

jdk/test/sun/security/smartcardio/TestConnectAgain.java

jdk/test/sun/security/smartcardio/TestControl.java

jdk/test/sun/security/smartcardio/TestDefault.java

jdk/test/sun/security/smartcardio/TestExclusive.java

jdk/test/sun/security/smartcardio/TestMultiplePresent.java

jdk/test/sun/security/smartcardio/TestPresent.java

jdk/test/sun/security/smartcardio/TestTransmit.java

jdk/test/sun/security/smartcardio/Utils.java

jdk/test/sun/security/tools/jarsigner/default_options.sh

jdk/test/sun/security/tools/jarsigner/weaksize.sh

jdk/test/sun/security/tools/keytool/default_options.sh

make/Javadoc.gmk

make/jprt.properties