hg: jdk9/sandbox/jdk: Merge

[erik.joelsson at oracle.com]

Changeset: 5c15cb1f9c9b
Author:    erikj
Date:      2015-12-09 13:44 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/5c15cb1f9c9b

Merge

! src/java.base/share/native/libzip/ZipFile.c
- src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngine.java
- src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngineFactory.java
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.h
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.m
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptEngine.m
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.h
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.m
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.h
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.m