hg: lambda/lambda/jdk: Merge cleanups

[mike.duigou at oracle.com]

Changeset: 068c47d1d7d2
Author:    mduigou
Date:      2013-08-15 14:35 -0700
URL:       http://hg.openjdk.java.net/lambda/lambda/jdk/rev/068c47d1d7d2

Merge cleanups

! src/share/classes/java/nio/file/Files.java