hg: jdk9/sandbox/jdk: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: a93cb6c74697
Author:    ihse
Date:      2015-04-10 11:34 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/a93cb6c74697

Merge

- make/Makefile
- make/gensrc/Gensrc-jdk.jconsole.gmk
! make/lib/Awt2dLibraries.gmk
! make/lib/CoreLibraries.gmk
- src/java.base/unix/conf/arm/jvm.cfg
- src/java.base/unix/conf/ppc/jvm.cfg
- src/jdk.jconsole/share/classes/sun/tools/jconsole/Version.java.template
- test/jdk/lambda/FDTest.java
- test/jdk/lambda/LambdaTranslationInInterface.java
- test/jdk/lambda/LambdaTranslationInnerConstructor.java
- test/jdk/lambda/MethodReferenceTestFDCCE.java
- test/jdk/lambda/MethodReferenceTestInnerDefault.java
- test/jdk/lambda/MethodReferenceTestInnerInstance.java
- test/jdk/lambda/MethodReferenceTestInnerVarArgsThis.java
- test/jdk/lambda/MethodReferenceTestInstance.java
- test/jdk/lambda/MethodReferenceTestKinds.java
- test/jdk/lambda/MethodReferenceTestNew.java
- test/jdk/lambda/MethodReferenceTestNewInner.java
- test/jdk/lambda/MethodReferenceTestSueCase1.java
- test/jdk/lambda/MethodReferenceTestSueCase2.java
- test/jdk/lambda/MethodReferenceTestSueCase4.java
- test/jdk/lambda/MethodReferenceTestSuper.java
- test/jdk/lambda/MethodReferenceTestSuperDefault.java
- test/jdk/lambda/MethodReferenceTestTypeConversion.java
- test/jdk/lambda/MethodReferenceTestVarArgs.java
- test/jdk/lambda/MethodReferenceTestVarArgsExt.java
- test/jdk/lambda/MethodReferenceTestVarArgsSuper.java
- test/jdk/lambda/MethodReferenceTestVarArgsSuperDefault.java
- test/jdk/lambda/MethodReferenceTestVarArgsThis.java
- test/jdk/lambda/shapegen/ClassCase.java
- test/jdk/lambda/shapegen/Hierarchy.java
- test/jdk/lambda/shapegen/HierarchyGenerator.java
- test/jdk/lambda/shapegen/Rule.java
- test/jdk/lambda/shapegen/RuleGroup.java
- test/jdk/lambda/shapegen/TTNode.java
- test/jdk/lambda/shapegen/TTParser.java
- test/jdk/lambda/shapegen/TTShape.java