Minor adjustments as a side-effect of the ongoing "merge to trunk" work.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK8@1625371 13f79535-47bb-0310-9956-ffa450edef68