hg: jdk9/dev/jdk: 2 new changesets

[weijun.wang at oracle.com]

Changeset: 5d95f2e1b9eb
Author:    weijun
Date:      2016-10-31 16:40 +0800
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/5d95f2e1b9eb

8168127: FilePermissionCollection merges incorrectly
Reviewed-by: rriggs

! src/java.base/share/classes/java/io/FilePermission.java
+ test/java/io/FilePermission/FilePermissionCollectionMerge.java

Changeset: 77f35eef4ef9
Author:    weijun
Date:      2016-10-31 16:41 +0800
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/77f35eef4ef9

8167646: Better invalid FilePermission
Reviewed-by: rriggs

! src/java.base/share/classes/java/io/FilePermission.java
+ test/java/io/FilePermission/Invalid.java