Merge branch 'security-stable-1.596' into security-stable-1.609

Conflicts:
	cli/src/test/java/hudson/cli/ConnectionTest.java
	pom.xml

cli/src/test/java/hudson/cli/ConnectionTest.java

@@ -1,9 +1,11 @@
 package hudson.cli;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import hudson.remoting.FastPipedInputStream;
 import hudson.remoting.FastPipedOutputStream;
+import org.codehaus.groovy.runtime.Security218;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -71,4 +73,15 @@ public class ConnectionTest {
             throw new Error("thread is still alive");
         }
     }
+
+    @Test
+    public void testSecurity218() throws Exception {
+        c1.writeObject(new Security218());
+        try {
+            c2.readObject();
+            fail();
+        } catch (SecurityException e) {
+            assertTrue(e.getMessage().contains(Security218.class.getName()));
+        }
+    }
 }

cli/src/test/java/org/codehaus/groovy/runtime/Security218.java

@@ -0,0 +1,11 @@
+package org.codehaus.groovy.runtime;
+
+import java.io.Serializable;
+
+/**
+ * Test payload in a prohibited package name.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class Security218 implements Serializable {
+}