Merge commit 'ebdc3652764e8ec2ce292879d459a8d0c6c2d2e3'

Conflicts:
	server/src/com/vaadin/server/VaadinSession.java

Change-Id: I51383060a95354b7ffbcc5b12683c1d1a817b8bf

diff --cc server/src/com/vaadin/server/VaadinSession.java
index 8f15dacc98c62cda9e07627b783a88f0d00895f7,c73ac8b686a721c114434008635d34400d209481..89259c53ca8f69301629269f2cab2f8ae9ba9f2e
--- 1/server/src/com/vaadin/server/VaadinSession.java
--- 2/server/src/com/vaadin/server/VaadinSession.java
+++ b/server/src/com/vaadin/server/VaadinSession.java
@@@ -1287,24 -1298,13 +1286,34 @@@ public class VaadinSession implements H
          return csrfToken;
      }
  
+     /**
+      * Override default deserialization logic to account for transient
+      * {@link #pendingAccessQueue}.
+      */
+     private void readObject(ObjectInputStream stream) throws IOException,
+             ClassNotFoundException {
+         stream.defaultReadObject();
+         pendingAccessQueue = new ConcurrentLinkedQueue<FutureAccess>();
+     }
++
 +    /**
 +     * Finds the UI with the corresponding embed id.
 +     * 
 +     * @since 7.2
 +     * @param embedId
 +     *            the embed id
 +     * @return the UI with the corresponding embed id, or <code>null</code> if
 +     *         no UI is found
 +     * 
 +     * @see UI#getEmbedId()
 +     */
 +    public UI getUIByEmbedId(String embedId) {
 +        Integer uiId = embedIdMap.get(embedId);
 +        if (uiId == null) {
 +            return null;
 +        } else {
 +            return getUIById(uiId.intValue());
 +        }
 +    }
 +
  }