hg: jdk9/sandbox/langtools: Merge

[stuart.marks at oracle.com]

Changeset: 066f4fb1ca47
Author:    smarks
Date:      2016-06-02 17:07 -0700
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/066f4fb1ca47

Merge

- src/jdk.jshell/share/classes/jdk/internal/jshell/jdi/JDIEnv.java
- test/jdk/jshell/ExecutionControlTest.java