Merge
diff --git a/.hgtags b/.hgtags
index 1395d91..b30292e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -323,3 +323,4 @@
d7d221f56fd17b96bab4440448641a844f9e92cd jdk8u25-b08
0c6cf43c5bcf0917d07a1bc94adb7a091f18f32c jdk8u25-b09
1317d94e95861a47fee8258903b652af70a3493c jdk8u25-b10
+f935349e2c065487c745bc41f81ddc7869bd2d2d jdk8u31-b00
diff --git a/src/share/lib/security/java.security-aix b/src/share/lib/security/java.security-aix
index d31a1e3..bb71a15 100644
--- a/src/share/lib/security/java.security-aix
+++ b/src/share/lib/security/java.security-aix
@@ -210,8 +210,8 @@
org.jcp.xml.dsig.internal.,\
jdk.internal.,\
jdk.nashorn.internal.,\
- jdk.nashorn.tools.
-
+ jdk.nashorn.tools.,\
+ com.sun.activation.registries.
#
# List of comma-separated packages that start with or equal this string
@@ -257,8 +257,8 @@
org.jcp.xml.dsig.internal.,\
jdk.internal.,\
jdk.nashorn.internal.,\
- jdk.nashorn.tools.
-
+ jdk.nashorn.tools.,\
+ com.sun.activation.registries.
#
# Determines whether this properties file can be appended to
diff --git a/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java b/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java
index 12139f6..a867e45 100644
--- a/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java
+++ b/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 6476665 7033534 6830714
+ * @bug 6476665 7033534 6830714 8052162
* @summary Verifies color conversion of Component Color Model based images
* @run main ColConvCCMTest
*/