diff --git a/README.md b/README.md
index 952614495..115de9e45 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>2.0.16</version><!-- or later-->
+            <version>2.0.18</version><!-- or later-->
         </dependency>
         <dependency>
           <groupId>javax.servlet</groupId>
@@ -131,7 +131,7 @@ Source code for remote APIs for App Engine.
     <dependency>
        <groupId>com.google.appengine</groupId>
        <artifactId>appengine-remote-api</artifactId>
-       <version>2.0.16</version><!-- Or later-->
+       <version>2.0.18</version><!-- Or later-->
     </dependency>
 ```
 
@@ -154,7 +154,7 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
     <dependency>
        <groupId>com.google.appengine</groupId>
        <artifactId>appengine-api-legacy.jar/artifactId>
-       <version>2.0.16</version><!-- Or later-->
+       <version>2.0.18</version><!-- Or later-->
     </dependency>
 ```
 
@@ -169,19 +169,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-testing</artifactId>
-       <version>2.0.16</version><!-- Or later-->
+       <version>2.0.18</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-stubs</artifactId>
-       <version>2.0.16</version><!-- Or later-->
+       <version>2.0.18</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-tools-sdk</artifactId>
-       <version>2.0.16</version><!-- Or later-->
+       <version>2.0.18</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
 ```
diff --git a/THIRD-PARTY.txt b/THIRD-PARTY.txt
index a763be96c..ca9dfa897 100644
--- a/THIRD-PARTY.txt
+++ b/THIRD-PARTY.txt
@@ -287,7 +287,7 @@ The repository contains 3rd-party code under the following licenses:
         * Protocol Buffers [Util] (com.google.protobuf:protobuf-java-util:3.21.5 - https://developers.google.com/protocol-buffers/protobuf-java-util/)
         * ThreeTen backport (org.threeten:threetenbp:1.5.2 - https://www.threeten.org/threetenbp)
         * ThreeTen-Extra (org.threeten:threeten-extra:1.7.0 - https://www.threeten.org/threeten-extra)
-        * YamlBeans (com.esotericsoftware.yamlbeans:yamlbeans:1.11 - https://github.com/EsotericSoftware/yamlbeans)
+        * YamlBeans (com.contrastsecurity:yamlbeans:1.11 -  https://github.com/Contrast-Security-OSS/yamlbeans)
 
     The JSON License
 
diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md
index 7c7848038..807ee79c9 100644
--- a/TRYLATESTBITSINPROD.md
+++ b/TRYLATESTBITSINPROD.md
@@ -43,12 +43,12 @@ top of your web application and change the entrypoint to boot with these jars in
  mvn clean install
 ```
 
-Let's assume the current built version is `2.0.17-SNAPSHOT`.
+Let's assume the current built version is `2.0.19-SNAPSHOT`.
 Add the dependency for the GAE runtime jars in your application pom.xml file:
 
 ```
  <properties>
-        <appengine.runtime.version>2.0.17-SNAPSHOT</appengine.runtime.version>
+        <appengine.runtime.version>2.0.19-SNAPSHOT</appengine.runtime.version>
         <appengine.runtime.location>${appengine.runtime.location}</appengine.runtime.location>
  <properties>
  ...
diff --git a/api/pom.xml b/api/pom.xml
index e2d665d67..fc1864cb6 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
diff --git a/api/src/main/java/com/google/appengine/api/memcache/AsyncMemcacheService.java b/api/src/main/java/com/google/appengine/api/memcache/AsyncMemcacheService.java
index fd06ae845..c88d04968 100644
--- a/api/src/main/java/com/google/appengine/api/memcache/AsyncMemcacheService.java
+++ b/api/src/main/java/com/google/appengine/api/memcache/AsyncMemcacheService.java
@@ -18,6 +18,7 @@
 
 import com.google.appengine.api.memcache.MemcacheService.CasValues;
 import com.google.appengine.api.memcache.MemcacheService.IdentifiableValue;
+import com.google.appengine.api.memcache.MemcacheService.ItemForPeek;
 import com.google.appengine.api.memcache.MemcacheService.SetPolicy;
 import java.util.Collection;
 import java.util.Map;
@@ -46,6 +47,16 @@ public interface AsyncMemcacheService extends BaseMemcacheService {
    */
   <T> Future<Map<T, IdentifiableValue>> getIdentifiables(Collection<T> keys);
 
+  /**
+   * @see MemcacheService#getItemForPeek(Object)
+   */
+  Future<ItemForPeek> getItemForPeek(Object key);
+
+  /**
+   * @see MemcacheService#getItemsForPeek(Collection)
+   */
+  <T> Future<Map<T, ItemForPeek>> getItemsForPeek(Collection<T> keys);
+
   /**
    * @see MemcacheService#contains(Object)
    */
diff --git a/api/src/main/java/com/google/appengine/api/memcache/AsyncMemcacheServiceImpl.java b/api/src/main/java/com/google/appengine/api/memcache/AsyncMemcacheServiceImpl.java
index 863a662dc..f54e9775f 100644
--- a/api/src/main/java/com/google/appengine/api/memcache/AsyncMemcacheServiceImpl.java
+++ b/api/src/main/java/com/google/appengine/api/memcache/AsyncMemcacheServiceImpl.java
@@ -22,6 +22,7 @@
 import com.google.appengine.api.memcache.MemcacheSerialization.ValueAndFlags;
 import com.google.appengine.api.memcache.MemcacheService.CasValues;
 import com.google.appengine.api.memcache.MemcacheService.IdentifiableValue;
+import com.google.appengine.api.memcache.MemcacheService.ItemForPeek;
 import com.google.appengine.api.memcache.MemcacheService.SetPolicy;
 import com.google.appengine.api.memcache.MemcacheServiceApiHelper.Provider;
 import com.google.appengine.api.memcache.MemcacheServiceApiHelper.RpcResponseHandler;
@@ -155,7 +156,42 @@ public String toString() {
       return builder.toString();
     }
   }
+ 
+  //@VisibleForTesting
+  static final class ItemForPeekImpl implements MemcacheService.ItemForPeek {
+    private final Object value;
+    private final Long expirationTimeSec;
+    private final Long lastAccessTimeSec;
+    private final Long deleteLockTimeSec;
+    ItemForPeekImpl(Object value, Long expirationTimeSec, Long lastAccessTimeSec, Long deleteLockTimeSec ) {
+      this.value = value;
+      this.expirationTimeSec = expirationTimeSec;
+      this.lastAccessTimeSec = lastAccessTimeSec;
+      this.deleteLockTimeSec = deleteLockTimeSec;
+    }
+
+    @Override
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public Long getExpirationTimeSec() {
+      return expirationTimeSec;
+    }
+
+    @Override
+    public Long getLastAccessTimeSec() {
+      return lastAccessTimeSec;
+    }
 
+    @Override
+    public Long getDeleteLockTimeSec() {
+      return deleteLockTimeSec;
+    }
+
+  }
+  
   //@VisibleForTesting
   static final class IdentifiableValueImpl implements IdentifiableValue {
     private final Object value;
@@ -456,7 +492,8 @@ private boolean maybeThrow(ErrorHandler errorHandler, String msg) {
   public Future<Boolean> contains(Object key) {
     return doGet(
         key,
-        false,
+        false, // forCas
+        false, // forPeek
         "Memcache contains: exception testing contains (" + key + ")",
         new Transformer<MemcacheGetResponse, Boolean>() {
           @Override
@@ -467,7 +504,7 @@ public Boolean transform(MemcacheGetResponse response) {
         DefaultValueProviders.falseValue());
   }
 
-  private <T> Future<T> doGet(Object key, boolean forCas, String errorText,
+  private <T> Future<T> doGet(Object key, boolean forCas, boolean forPeek, String errorText,
       final Transformer<MemcacheGetResponse, T> responseTransfomer, Provider<T> defaultValue) {
     MemcacheGetRequest.Builder requestBuilder = MemcacheGetRequest.newBuilder();
     requestBuilder.addKey(makePbKey(key));
@@ -475,6 +512,9 @@ private <T> Future<T> doGet(Object key, boolean forCas, String errorText,
     if (forCas) {
       requestBuilder.setForCas(true);
     }
+    if (forPeek) {
+      requestBuilder.setForPeek(true);
+    }
     return makeAsyncCall("Get", requestBuilder.build(),
         createRpcResponseHandler(MemcacheGetResponse.getDefaultInstance(), errorText,
             responseTransfomer), defaultValue);
@@ -484,7 +524,8 @@ private <T> Future<T> doGet(Object key, boolean forCas, String errorText,
   public Future<Object> get(final Object key) {
     return doGet(
         key,
-        false,
+        false, // forCas
+        false, // forPeek
         "Memcache get: exception getting 1 key (" + key + ")",
         new Transformer<MemcacheGetResponse, Object>() {
           @Override
@@ -499,7 +540,8 @@ public Object transform(MemcacheGetResponse response) {
   public Future<IdentifiableValue> getIdentifiable(final Object key) {
     return doGet(
         key,
-        true,
+        true,  // forCas
+        false, // forPeek
         "Memcache getIdentifiable: exception getting 1 key (" + key + ")",
         new IdentifiableTransformer(key),
         DefaultValueProviders.<IdentifiableValue>nullValue());
@@ -527,7 +569,8 @@ public IdentifiableValue transform(MemcacheGetResponse response) {
   public <K> Future<Map<K, IdentifiableValue>> getIdentifiables(Collection<K> keys) {
     return doGetAll(
         keys,
-        true,
+        true,  // forCas
+        false, // forKeep
         "Memcache getIdentifiables: exception getting multiple keys",
         new Transformer<KeyValuePair<K, MemcacheGetResponse.Item>, IdentifiableValue>() {
           @Override
@@ -540,11 +583,82 @@ public IdentifiableValue transform(KeyValuePair<K, MemcacheGetResponse.Item> pai
         DefaultValueProviders.<K, IdentifiableValue>emptyMap());
   }
 
+  
+  @Override
+  public Future<ItemForPeek> getItemForPeek(final Object key) {
+    return doGet(
+        key,
+        false, // forCas
+        true,  // forPeek
+        "Memcache getItemForPeek: exception getting 1 key (" + key + ")",
+        new ItemForPeekTransformer(key),
+        DefaultValueProviders.<ItemForPeek>nullValue());
+  }
+
+  private class ItemForPeekTransformer
+      implements Transformer<MemcacheGetResponse, ItemForPeek> {
+    private final Object key;
+
+    ItemForPeekTransformer(Object key) {
+      this.key = key;
+    }
+
+    @Override
+    public ItemForPeek transform(MemcacheGetResponse response) {
+      if (response.getItemCount() == 0) {
+        return null;
+      }
+      MemcacheGetResponse.Item item = response.getItem(0);
+      Object value;
+      if (item.hasIsDeleteLocked() && item.getIsDeleteLocked()) {
+        value = null;
+      } else {
+        value = deserializeItem(key, item);
+      }
+
+      return new ItemForPeekImpl(
+          value,
+          item.hasTimestamps() ? item.getTimestamps().getExpirationTimeSec() : null,
+          item.hasTimestamps() ? item.getTimestamps().getLastAccessTimeSec() : null,
+          item.hasTimestamps() ? item.getTimestamps().getDeleteLockTimeSec() : null);
+    }
+  }
+
+  @Override
+  public <K> Future<Map<K, ItemForPeek>> getItemsForPeek(Collection<K> keys) {
+    return doGetAll(
+        keys,
+        false, // forCas
+        true, // forPeek
+        "Memcache getItemsForPeek: exception getting multiple keys",
+        new Transformer<KeyValuePair<K, MemcacheGetResponse.Item>, MemcacheService.ItemForPeek>() {
+          @Override
+          public MemcacheService.ItemForPeek transform(
+              KeyValuePair<K, MemcacheGetResponse.Item> pair) {
+            MemcacheGetResponse.Item item = pair.value;
+            Object value;
+            if (item.hasIsDeleteLocked() && item.getIsDeleteLocked()) {
+              value = null;
+            } else {
+              value = deserializeItem(pair.key, item);
+            }
+
+            return new ItemForPeekImpl(
+                value,
+                item.hasTimestamps() ? item.getTimestamps().getExpirationTimeSec() : null,
+                item.hasTimestamps() ? item.getTimestamps().getLastAccessTimeSec() : null,
+                item.hasTimestamps() ? item.getTimestamps().getDeleteLockTimeSec() : null);
+          }
+        },
+        DefaultValueProviders.<K, MemcacheService.ItemForPeek>emptyMap());
+  }
+
   @Override
   public <K> Future<Map<K, Object>> getAll(Collection<K> keys) {
     return doGetAll(
         keys,
-        false,
+        false, // forCas
+        false, // forPeek
         "Memcache getAll: exception getting multiple keys",
         new Transformer<KeyValuePair<K, MemcacheGetResponse.Item>, Object>() {
           @Override
@@ -555,7 +669,7 @@ public Object transform(KeyValuePair<K, MemcacheGetResponse.Item> pair) {
         DefaultValueProviders.<K, Object>emptyMap());
   }
 
-  private <K, V> Future<Map<K, V>> doGetAll(Collection<K> keys, boolean forCas,
+  private <K, V> Future<Map<K, V>> doGetAll(Collection<K> keys, boolean forCas, boolean forPeek,
       String errorText,
       Transformer<KeyValuePair<K, MemcacheGetResponse.Item>, V> responseTransformer,
       Provider<Map<K, V>> defaultValue) {
@@ -570,6 +684,9 @@ private <K, V> Future<Map<K, V>> doGetAll(Collection<K> keys, boolean forCas,
     if (forCas) {
       requestBuilder.setForCas(forCas);
     }
+    if (forPeek) {
+      requestBuilder.setForPeek(forPeek);
+    }
     Transformer<MemcacheGetResponse, Map<K, V>> rpcResponseTransformer =
         new GetAllRpcResponseTransformer<>(byteStringToKey, responseTransformer);
     return makeAsyncCall(
diff --git a/api/src/main/java/com/google/appengine/api/memcache/MemcacheService.java b/api/src/main/java/com/google/appengine/api/memcache/MemcacheService.java
index d60938f0a..e9ce9fff9 100644
--- a/api/src/main/java/com/google/appengine/api/memcache/MemcacheService.java
+++ b/api/src/main/java/com/google/appengine/api/memcache/MemcacheService.java
@@ -104,6 +104,40 @@ interface IdentifiableValue {
     Object getValue();
   }
 
+  /**
+   * ...
+   */
+  interface ItemForPeek {    
+     /**
+     * @return the encapsulated value object.
+     */
+    Object getValue();
+    /**
+     * <pre>
+     * @return the expiration timestamp of the item in unix epoch seconds, or null if
+     *  this item has no expiration timestamp.
+     * </pre>
+     */
+     Long getExpirationTimeSec();
+
+    /**
+     * <pre>
+     * @return the last accessed timestamp of the item in unix epoch seconds, or null if this item has no
+     * last access timestamp.
+     * </pre>
+     *
+     */
+     Long getLastAccessTimeSec();
+
+    /**
+     * <pre>
+     * @return the delete_time timestamp in unix epoch seconds resulting from setting the millisNoReAdd 
+     * parameter of the item, or null if this item is not delete locked.
+     * </pre>
+     */
+    Long getDeleteLockTimeSec();
+  }
+
   /**
    * A holder for compare and set values.
    * {@link Expiration expiration} and {@code newValue} can be null.
@@ -201,6 +235,26 @@ public int hashCode() {
    */
   IdentifiableValue getIdentifiable(Object key);
 
+ /**
+   * Similar to {@link #get}, but returns an object that can provide extra timestamp
+   * metadata.
+   *
+   * <p>If an error deserializing the value occurs, this passes
+   * an {@link InvalidValueException} to the service's {@link ErrorHandler}.
+   * If a service error occurs, this passes a {@link MemcacheServiceException}.
+   * See {@link BaseMemcacheService#setErrorHandler(ErrorHandler)}.
+   *
+   * @param key the key object used to store the cache entry
+   * @return an {@link ItemForPeek} object that wraps the
+   * value object stored as well as extra meta data timestamps.
+   *   {@code null} is returned if {@code key} is not present in the cache.
+   * @throws IllegalArgumentException if {@code key} is not
+   *    {@link Serializable} and is not {@code null}
+   */
+   default ItemForPeek getItemForPeek(Object key) {
+     throw new UnsupportedOperationException();
+   };
+
   /**
    * Performs a getIdentifiable for multiple keys at once.
    * This is more efficient than multiple separate calls to
@@ -219,6 +273,26 @@ public int hashCode() {
    */
   <T> Map<T, IdentifiableValue> getIdentifiables(Collection<T> keys);
 
+   /**
+   * Performs a getItemForPeek for multiple keys at once.
+   * This is more efficient than multiple separate calls to
+   * {@link #getItemForPeek(Object)}.
+   *
+   * <p>If an error deserializing the value occurs, this passes
+   * an {@link InvalidValueException} to the service's {@link ErrorHandler}.
+   * If a service error occurs, this passes a {@link MemcacheServiceException}.
+   * See {@link BaseMemcacheService#setErrorHandler(ErrorHandler)}.
+   *
+   * @param keys a collection of keys for which values should be retrieved
+   * @return a mapping from keys to {@link ItemForPeek} of any entries found. If a requested
+   *     key is not found in the cache, the key will not be in the returned Map.
+   * @throws IllegalArgumentException if any element of {@code keys} is not
+   *    {@link Serializable} and is not {@code null}
+   */
+   default <T> Map<T, ItemForPeek> getItemsForPeek(Collection<T> keys) {
+     throw new UnsupportedOperationException();
+   };
+
   /**
    * Tests whether a given value is in cache, even if its value is {@code null}.
    *
diff --git a/api/src/main/java/com/google/appengine/api/memcache/MemcacheServiceImpl.java b/api/src/main/java/com/google/appengine/api/memcache/MemcacheServiceImpl.java
index 15120f81f..fe7ee3bb3 100644
--- a/api/src/main/java/com/google/appengine/api/memcache/MemcacheServiceImpl.java
+++ b/api/src/main/java/com/google/appengine/api/memcache/MemcacheServiceImpl.java
@@ -77,6 +77,16 @@ public <T> Map<T, IdentifiableValue> getIdentifiables(Collection<T> keys) {
   public <T> Map<T, Object> getAll(Collection<T> keys) {
     return quietGet(async.getAll(keys));
   }
+  
+  @Override
+  public ItemForPeek getItemForPeek(Object key) {
+    return quietGet(async.getItemForPeek(key));
+  }
+
+  @Override
+  public <T> Map<T, ItemForPeek> getItemsForPeek(Collection<T> keys) {
+   return quietGet(async.getItemsForPeek(keys));
+ }
 
   @Override
   public boolean put(Object key, Object value, Expiration expires, SetPolicy policy) {
diff --git a/api_dev/pom.xml b/api_dev/pom.xml
index 3a9a2aa91..f26e31800 100644
--- a/api_dev/pom.xml
+++ b/api_dev/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/api_dev/src/test/java/com/google/appengine/api/memcache/MemcacheServiceImplTest.java b/api_dev/src/test/java/com/google/appengine/api/memcache/MemcacheServiceImplTest.java
index d851aadb4..c7eb64160 100644
--- a/api_dev/src/test/java/com/google/appengine/api/memcache/MemcacheServiceImplTest.java
+++ b/api_dev/src/test/java/com/google/appengine/api/memcache/MemcacheServiceImplTest.java
@@ -34,10 +34,12 @@
 
 import com.google.appengine.api.NamespaceManager;
 import com.google.appengine.api.memcache.AsyncMemcacheServiceImpl.IdentifiableValueImpl;
+import com.google.appengine.api.memcache.AsyncMemcacheServiceImpl.ItemForPeekImpl;
 import com.google.appengine.api.memcache.MemcacheSerialization.Flag;
 import com.google.appengine.api.memcache.MemcacheSerialization.ValueAndFlags;
 import com.google.appengine.api.memcache.MemcacheService.CasValues;
 import com.google.appengine.api.memcache.MemcacheService.IdentifiableValue;
+import com.google.appengine.api.memcache.MemcacheService.ItemForPeek;
 import com.google.appengine.api.memcache.MemcacheService.SetPolicy;
 import com.google.appengine.api.memcache.MemcacheServicePb.MemcacheBatchIncrementRequest;
 import com.google.appengine.api.memcache.MemcacheServicePb.MemcacheBatchIncrementResponse;
@@ -1976,6 +1978,140 @@ public void testMultiGetIdentifiable() {
     multiGetIdentifiableTest(memcache, "ns2");
   }
 
+  @Test
+  public void testGetForPeek() {
+    MemcacheServiceImpl memcache = new MemcacheServiceImpl(null);
+    String namespace = "";
+    String[] keys = {ONE, TWO, null, null};
+    String[] values = {ONE, null, TWO, null};
+    for (int i = 0; i < keys.length; i++) {
+      String key = keys[i];
+      String value = values[i];
+      byte[] pbKey = makePbKey(key);
+      MemcacheGetRequest request =
+          MemcacheGetRequest.newBuilder()
+              .setNameSpace(namespace)
+              .setForPeek(true)
+              .addKey(ByteString.copyFrom(pbKey))
+              .build();
+      MemcacheGetResponse response =
+          MemcacheGetResponse.newBuilder()
+              .addItem(
+                  MemcacheGetResponse.Item.newBuilder()
+                      .setFlags(value == null ? Flag.OBJECT.ordinal() : Flag.UTF8.ordinal())
+                      .setKey(ByteString.copyFrom(pbKey))
+                      .setValue(ByteString.copyFrom(serialize(value).value))
+                      .setTimestamps(
+                          MemcacheServicePb.ItemTimestamps.newBuilder()
+                              .setExpirationTimeSec(1)
+                              .setLastAccessTimeSec(2)
+                              .setDeleteLockTimeSec(3)
+                              .build()))
+              .build();
+      expectAsyncCall("Get", request, response);
+      ItemForPeek v = memcache.getItemForPeek(key);
+      assertThat(v.getExpirationTimeSec()).isEqualTo(Long.valueOf(1));
+      assertThat(v.getLastAccessTimeSec()).isEqualTo(Long.valueOf(2));
+      assertThat(v.getDeleteLockTimeSec()).isEqualTo(Long.valueOf(3));
+      assertThat(v.getValue()).isEqualTo(value);
+      verifyAsyncCall("Get", request);
+    }
+  }
+
+  private void multiItemsForPeekTest(MemcacheService memcache, String namespace) {
+    MemcacheGetRequest request =
+        MemcacheGetRequest.newBuilder()
+            .setNameSpace(namespace)
+            .setForPeek(true)
+            .addKey(ByteString.copyFrom(makePbKey(ONE)))
+            .addKey(ByteString.copyFrom(makePbKey(null)))
+            .addKey(ByteString.copyFrom(makePbKey("Missing")))
+            .build();
+    MemcacheGetResponse response =
+        MemcacheGetResponse.newBuilder()
+            .addItem(
+                MemcacheGetResponse.Item.newBuilder()
+                    .setKey(ByteString.copyFrom(makePbKey(ONE)))
+                    .setTimestamps(
+                        MemcacheServicePb.ItemTimestamps.newBuilder()
+                            .setExpirationTimeSec(1)
+                            .setLastAccessTimeSec(2)
+                            .setDeleteLockTimeSec(3)
+                            .build())
+                    .setFlags(Flag.OBJECT.ordinal())
+                    .setValue(ByteString.copyFrom(serialize(null).value)))
+            .addItem(
+                MemcacheGetResponse.Item.newBuilder()
+                    .setKey(ByteString.copyFrom(makePbKey(null)))
+                    .setTimestamps(
+                        MemcacheServicePb.ItemTimestamps.newBuilder()
+                            .setExpirationTimeSec(10)
+                            .setLastAccessTimeSec(20)
+                            .setDeleteLockTimeSec(30)
+                            .build())
+                    .setFlags(Flag.INTEGER.ordinal())
+                    .setValue(ByteString.copyFrom(serialize(456).value)))
+            .build();
+    expectAsyncCall("Get", request, response);
+    ArrayList<String> collection = new ArrayList<>();
+    collection.add(ONE);
+    collection.add(null);
+    collection.add("Missing");
+    Map<String, ItemForPeek> result = memcache.getItemsForPeek(collection);
+    assertThat(result).hasSize(2);
+    assertThat(result.get(ONE).getValue()).isEqualTo(null);
+    assertThat(((ItemForPeekImpl) result.get(ONE)).getExpirationTimeSec()).isEqualTo(1);
+    assertThat(((ItemForPeekImpl) result.get(ONE)).getLastAccessTimeSec()).isEqualTo(2);
+    assertThat(((ItemForPeekImpl) result.get(ONE)).getDeleteLockTimeSec()).isEqualTo(3);
+    assertThat(result.get(null).getValue()).isEqualTo(456);
+    assertThat(((ItemForPeekImpl) result.get(null)).getExpirationTimeSec()).isEqualTo(10);
+    assertThat(((ItemForPeekImpl) result.get(null)).getLastAccessTimeSec()).isEqualTo(20);
+    assertThat(((ItemForPeekImpl) result.get(null)).getDeleteLockTimeSec()).isEqualTo(30);
+    verifyAsyncCall("Get", request);
+  }
+
+  @Test
+  public void testMultiItemForPeek() {
+    MemcacheService memcache = new MemcacheServiceImpl(null);
+    NamespaceManager.set("");
+    multiItemsForPeekTest(memcache, "");
+    NamespaceManager.set("ns");
+    multiItemsForPeekTest(memcache, "ns");
+    memcache = new MemcacheServiceImpl("ns2");
+    multiItemsForPeekTest(memcache, "ns2");
+  }
+
+  @Test
+  public void testGetWithPeekAfterDelete() {
+    MemcacheService memcache = new MemcacheServiceImpl(null);
+    NamespaceManager.set("");
+    byte[] pbKey = makePbKey(ONE);
+    MemcacheGetRequest request =
+        MemcacheGetRequest.newBuilder()
+            .setNameSpace("")
+            .setForPeek(true)
+            .addKey(ByteString.copyFrom(pbKey))
+            .build();
+    MemcacheGetResponse response =
+        MemcacheGetResponse.newBuilder()
+            .addItem(
+                MemcacheGetResponse.Item.newBuilder()
+                    .setFlags(Flag.BOOLEAN.ordinal())
+                    .setKey(ByteString.copyFrom(pbKey))
+                    .setValue(ByteString.copyFromUtf8(""))
+                    .setIsDeleteLocked(true)
+                    .setTimestamps(
+                        MemcacheServicePb.ItemTimestamps.newBuilder()
+                            .setDeleteLockTimeSec(3)
+                            .build()))
+            .build();
+    expectAsyncCall("Get", request, response);
+    ItemForPeek v = memcache.getItemForPeek(ONE);
+    assertThat(v.getDeleteLockTimeSec()).isEqualTo(Long.valueOf(3));
+    assertThat(v.getValue()).isEqualTo(null);
+    verifyAsyncCall("Get", request);
+  }
+
   @Test
   public void testPutIfUntouched() {
     MemcacheServiceImpl memcache = new MemcacheServiceImpl(null);
diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml
index f914597a6..02245185c 100644
--- a/api_legacy/pom.xml
+++ b/api_legacy/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml
index 0ca39bea9..04e3e24a5 100644
--- a/appengine-api-1.0-sdk/pom.xml
+++ b/appengine-api-1.0-sdk/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-api-1.0-sdk</name>
diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml
index e98d36b91..2247931ee 100644
--- a/appengine-api-stubs/pom.xml
+++ b/appengine-api-stubs/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
@@ -285,7 +285,7 @@
               </relocations>
               <filters>
                 <filter>
-                  <artifact>com.esotericsoftware.yamlbeans:yamlbeans</artifact>
+                  <artifact>com.contrastsecurity:yamlbeans</artifact>
                   <includes>
                     <!-- Used by apphosting/utils/config/QueueYamlReader -->
                     <include>com/esotericsoftware/yamlbeans/**</include>
@@ -362,7 +362,7 @@
               </filters>
               <artifactSet>
                 <includes>
-                  <include>com.esotericsoftware.yamlbeans:yamlbeans</include>
+                  <include>com.contrastsecurity:yamlbeans</include>
                   <include>com.google.appengine:appengine-apis-dev</include>
                   <include>com.google.appengine:mediautil</include>
                   <include>com.google.appengine:shared-sdk</include>
diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml
index 3a0adb302..92cd06bd5 100644
--- a/appengine_jsr107/pom.xml
+++ b/appengine_jsr107/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.17-SNAPSHOT</version>
+        <version>2.0.20-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml
index 2bbab1f58..c0e5a6d7e 100644
--- a/appengine_resources/pom.xml
+++ b/appengine_resources/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-resources</name>
diff --git a/appengine_setup/test/pom.xml b/appengine_setup/test/pom.xml
index 4bd646628..6434eb69f 100644
--- a/appengine_setup/test/pom.xml
+++ b/appengine_setup/test/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>23.0</version>
+      <version>32.1.2-jre</version>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml
index e5288bdfb..cf40ea245 100644
--- a/appengine_testing/pom.xml
+++ b/appengine_testing/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml
index 850ca85e2..14a830bce 100644
--- a/appengine_testing_tests/pom.xml
+++ b/appengine_testing_tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.17-SNAPSHOT</version>
+        <version>2.0.20-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/applications/pom.xml b/applications/pom.xml
index 35affda0c..e2a89e2bd 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <properties>
diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml
index b737ffd5c..54a928a0f 100644
--- a/applications/proberapp/pom.xml
+++ b/applications/proberapp/pom.xml
@@ -14,9 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
@@ -27,7 +25,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>applications</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
     <properties>
diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml
index d35ad917d..0f6cbf554 100644
--- a/applications/springboot/pom.xml
+++ b/applications/springboot/pom.xml
@@ -15,13 +15,12 @@
  limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>springboot</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>AppEngine :: springboot</name>
diff --git a/e2etests/pom.xml b/e2etests/pom.xml
new file mode 100644
index 000000000..de83404b5
--- /dev/null
+++ b/e2etests/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.google.appengine</groupId>
+  <artifactId>e2etests</artifactId>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>parent</artifactId>
+    <version>2.0.20-SNAPSHOT</version>
+  </parent>
+  <name>AppEngine :: e2e tests</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>testlocalapps</module>
+    <module>stagingtests</module>
+  </modules>
+</project>
diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml
new file mode 100644
index 000000000..dc46b382a
--- /dev/null
+++ b/e2etests/stagingtests/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>stagingtests</artifactId>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>e2etests</artifactId>
+    <version>2.0.20-SNAPSHOT</version>
+  </parent>
+
+  <packaging>jar</packaging>
+  <name>AppEngine :: e2e staging tests</name>
+
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+  </properties>
+  <dependencies>
+
+
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>runtime-testapps</artifactId>
+      <classifier>jar-with-dependencies</classifier>
+      <scope>test</scope>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- guava needed by the testapps above.-->
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-utils</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-tools-sdk</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java
new file mode 100644
index 000000000..85cf18917
--- /dev/null
+++ b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java
@@ -0,0 +1,1797 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.appengine.tools.admin;
+
+
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.Maps;
+import com.google.common.io.Files;
+import com.google.common.io.MoreFiles;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import com.google.apphosting.utils.config.AppEngineConfigException;
+import com.google.apphosting.utils.config.AppEngineWebXml;
+import com.google.apphosting.utils.config.CronXml;
+import com.google.apphosting.utils.config.GenerationDirectory;
+import com.google.apphosting.utils.config.RetryParametersXml;
+import com.google.apphosting.utils.config.StagingOptions;
+
+import java.io.BufferedWriter;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.FileVisitOption;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+/**
+ * Tests for the Application functionality
+ *
+ * @author fabbott@google.com (Freeland Abbott)
+ */
+@RunWith(JUnit4.class)
+public class ApplicationTest {
+  private static final String SDK_ROOT_PROPERTY = "appengine.sdk.root";
+
+  private static final String TEST_FILES = getWarPath("sampleapp");
+  private static final String TEST_FILES_RUNTIME_DEFINED = getWarPath("sampleapp-runtime");
+  private static final String TEST_FILES_AUTOMATIC_MODULE =
+      getWarPath("sampleapp-automatic-module");
+  private static final String TEST_FILES_MANUAL_MODULE = getWarPath("sampleapp-manual-module");
+  private static final String TEST_FILES_BASIC_MODULE = getWarPath("sampleapp-basic-module");
+  private static final String TEST_FILES_BACKENDS = getWarPath("sampleapp-backends");
+  private static final String TEST_JSPX_FILES = getWarPath("sample-jspx");
+  private static final String TEST_TAGS_FILES = getWarPath("sample-jsptaglibrary");
+  private static final String TEST_ERROR_IN_TAGS_FILES = getWarPath("sample-error-in-tag-file");
+  private static final String NOJSP_TEST_FILES = getWarPath("sample-nojsps");
+  private static final String BAD_WEBXML_TEST_FILES = getWarPath("sample-badweb");
+  private static final String BAD_RUNTIME_CHANNEL = getWarPath("sample-badruntimechannel");
+  private static final String TEST_JAVA11 = getWarPath("sample-java11");
+  private static final String TEST_JAVA17 = getWarPath("sample-java17");
+  private static final String BAD_ENTRYPOINT = getWarPath("sample-badentrypoint");
+  private static final String BAD_APPENGINEWEBXML_TEST_FILES = getWarPath("sample-badaeweb");
+  private static final String BAD_INDEXESXML_TEST_FILES = getWarPath("sample-badindexes");
+  private static final String MISSING_APP_ID_TEST_FILES = getWarPath("sample-missingappid");
+  private static final String INCLUDE_HTTP_HEADERS_TEST_FILES = getWarPath("http-headers");
+  private static final String XMLORDERING_TEST_FILES = getWarPath("xmlorder");
+  private static final String BAD_CRONXML_TEST_FILES = getWarPath("badcron");
+  private static final String JAVA8_NO_WEBXML = getWarPath("java8-no-webxml");
+  private static final String CRON_RETRY_PARAMETERS_TEST_FILES =
+      getWarPath("cron-good-retry-parameters");
+  private static final String CRON_NEGATIVE_RETRY_LIMIT_TEST_FILES =
+      getWarPath("cron-negative-retry-limit");
+  private static final String CRON_NEGATIVE_MAX_BACKOFF_TEST_FILES =
+      getWarPath("cron-negative-max-backoff");
+  private static final String CRON_TWO_MAX_DOUBLINGS_TEST_FILES =
+      getWarPath("cron-two-max-doublings");
+  private static final String CRON_BAD_AGE_LIMIT_TEST_FILES = getWarPath("cron-bad-job-age-limit");
+
+  private static final String LEGACY_AUTO_ID_POLICY_TEST_FILES =
+      getWarPath("sample-legacy-auto-ids");
+  private static final String UNSPECIFIED_AUTO_ID_POLICY_TEST_FILES =
+      getWarPath("sample-unspecified-auto-ids");
+  private static final String DEFAULT_AUTO_ID_POLICY_TEST_FILES =
+      getWarPath("sample-default-auto-ids");
+  private static final String JAVA8_JAR_TEST_FILES = getWarPath("java8-jar");
+  private static final String CLASSES_TEST_FILES = getWarPath("sample-with-classes");
+
+  private static final String SDK_ROOT =getSDKRoot();
+
+  private static final String SERVLET3_STANDARD_APP_ROOT =getWarPath("bundle_standard");
+  private static final String SERVLET3_STANDARD_APP_NO_JSP_ROOT =getWarPath("bundle_standard_with_no_jsp");
+  private static final String SERVLET3_STANDARD_WEBLISTENER_MEMCACHE =getWarPath("bundle_standard_with_weblistener_memcache");
+  private static final String SERVLET3_STANDARD_APP_WITH_CONTAINER_INIT =getWarPath("bundle_standard_with_container_initializer");
+  private static final String SERVLET3_APP_ID = "servlet3-demo";
+
+  private static final String STAGE_TEST_APP = getWarPath("stage-sampleapp");
+  private static final String STAGE_WITH_APPID_AND_VERSION_TEST_APP =
+      getWarPath("stage-with-appid-and-version");
+  private static final String STAGE_WITH_STAGING_OPTIONS = getWarPath("stage-with-staging-options");
+
+  private static final int RANDOM_HTML_SIZE = 704;
+  private static final String APPID = "sampleapp";
+  private static final String MODULE_ID = "stan";
+  private static final String APPVER = "1";
+  private String oldSdkRoot;
+  @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  private static final String APPENGINE_WEB_XML_CONTENT =
+      "<appengine-web-app xmlns=\"http://appengine.google.com/ns/1.0\">"
+          + "<application>sampleapp</application><version>1</version><static-files/>"
+          + "<threadsafe>true</threadsafe><vm>true</vm><resource-files/></appengine-web-app>";
+
+  private static String getWarPath(String directoryName) {
+          File currentDirectory = new File("").getAbsoluteFile();
+
+    String appRoot = new File(currentDirectory, "../testlocalapps/"+directoryName+"/target/"+directoryName+"-0.0.1-SNAPSHOT").getAbsolutePath();
+                                System.out.println(appRoot);
+
+//    assertThat(appRoot.isDirectory()).isTrue();
+return appRoot;
+
+
+  }
+   private static String getSDKRoot()  {
+          File currentDirectory = new File("").getAbsoluteFile();
+    String sdkRoot= null;
+      try {
+          sdkRoot = new File(currentDirectory, "../../sdk_assembly/target/appengine-java-sdk").getCanonicalPath();
+      } catch (IOException ex) {
+          Logger.getLogger(ApplicationTest.class.getName()).log(Level.SEVERE, null, ex);
+      }
+return sdkRoot;
+
+
+  }
+  /** Set the appengine.sdk.root system property to make SdkInfo happy. */
+  @Before
+  public void setUp() {
+    oldSdkRoot = System.setProperty(SDK_ROOT_PROPERTY, SDK_ROOT);
+  }
+
+  @After
+  public void tearDown() {
+    if (oldSdkRoot != null) {
+      System.setProperty(SDK_ROOT_PROPERTY, oldSdkRoot);
+    } else {
+      System.clearProperty(SDK_ROOT_PROPERTY);
+    }
+  }
+
+  private static void checkIfEntryIsInJarFile(File jarFile, String entryName) {
+    assertThat(jarFile.exists()).isTrue();
+    try {
+      JarFile jar = new JarFile(jarFile);
+      try {
+        Enumeration<JarEntry> jarEntries = jar.entries();
+        while (jarEntries.hasMoreElements()) {
+          JarEntry jarEntry = jarEntries.nextElement();
+          if (jarEntry.getName().equals(entryName)) {
+            return;
+          }
+        }
+      } finally {
+        jar.close();
+      }
+    } catch (Exception e) {
+      throw new AssertionError("Cannot read jar file: " + jarFile.getAbsolutePath(), e);
+    }
+    fail("Jar does not contain entry: " + entryName);
+  }
+
+  @Test
+  public void testModuleOverride() throws IOException {
+    Application testApp = Application.readApplication(TEST_FILES_AUTOMATIC_MODULE);
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    assertThat(testApp.getModule()).isEqualTo(MODULE_ID);
+    assertThat(testApp.getVersion()).isEqualTo(APPVER);
+
+    testApp = Application.readApplication(TEST_FILES_AUTOMATIC_MODULE, null, "newModule", null);
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    assertThat(testApp.getModule()).isEqualTo("newModule");
+    assertThat(testApp.getVersion()).isEqualTo(APPVER);
+
+    testApp =
+        Application.readApplication(
+            TEST_FILES_AUTOMATIC_MODULE, "newId", "newModule", "newVersion");
+    assertThat(testApp.getAppId()).isEqualTo("newId");
+    assertThat(testApp.getModule()).isEqualTo("newModule");
+    assertThat(testApp.getVersion()).isEqualTo("newVersion");
+  }
+
+  @Test
+  public void testAppIdAppVerOverride() throws IOException {
+    Application testApp = Application.readApplication(TEST_FILES);
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    assertThat(testApp.getModule()).isNull();
+    assertThat(testApp.getVersion()).isEqualTo(APPVER);
+
+    testApp = Application.readApplication(TEST_FILES, null, null, null);
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    assertThat(testApp.getModule()).isNull();
+    assertThat(testApp.getVersion()).isEqualTo(APPVER);
+
+    testApp = Application.readApplication(TEST_FILES, null, null, "newVersion");
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    assertThat(testApp.getModule()).isNull();
+    assertThat(testApp.getVersion()).isEqualTo("newVersion");
+
+    testApp = Application.readApplication(TEST_FILES, "newId", null, null);
+    assertThat(testApp.getAppId()).isEqualTo("newId");
+    assertThat(testApp.getModule()).isNull();
+    assertThat(testApp.getVersion()).isEqualTo(APPVER);
+
+    testApp = Application.readApplication(TEST_FILES, null, "newModule", null);
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    assertThat(testApp.getModule()).isEqualTo("newModule");
+    assertThat(testApp.getVersion()).isEqualTo(APPVER);
+
+    testApp = Application.readApplication(TEST_FILES, "newId", "newModule", "newVersion");
+    assertThat(testApp.getAppId()).isEqualTo("newId");
+    assertThat(testApp.getModule()).isEqualTo("newModule");
+    assertThat(testApp.getVersion()).isEqualTo("newVersion");
+  }
+
+  @Test
+  public void testMissingAppIdNoOverride() throws Exception {
+    Application testApp =
+        Application.readApplication(MISSING_APP_ID_TEST_FILES, null, null, "ignoredVersion");
+    assertThrows(AppEngineConfigException.class, () -> testApp.validate());
+  }
+
+  @Test
+  public void testMissingAppIdAndVersionWithOverride() throws Exception {
+    Application testApp =
+        Application.readApplication(MISSING_APP_ID_TEST_FILES, "newId", null, "newVersion");
+    assertThat(testApp.getAppId()).isEqualTo("newId");
+    assertThat(testApp.getVersion()).isEqualTo("newVersion");
+  }
+
+  @Test
+  public void testLegacyAutoIdPolicy() throws IOException {
+    Application testApp = Application.readApplication(LEGACY_AUTO_ID_POLICY_TEST_FILES);
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    assertThat(testApp.getAppEngineWebXml().getAutoIdPolicy()).isEqualTo("legacy");
+  }
+
+  @Test
+  public void testDefaultAutoIdPolicy() throws IOException {
+    Application testApp = Application.readApplication(DEFAULT_AUTO_ID_POLICY_TEST_FILES);
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    assertThat(testApp.getAppEngineWebXml().getAutoIdPolicy()).isEqualTo("default");
+  }
+
+  @Test
+  public void testUnspecifiedAutoIdPolicy() throws IOException {
+    Application testApp = Application.readApplication(UNSPECIFIED_AUTO_ID_POLICY_TEST_FILES);
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    assertThat(testApp.getAppEngineWebXml().getAutoIdPolicy()).isNull();
+  }
+
+  @Test
+  public void testReadApplicationForStaging() throws IOException {
+    Application testApp = Application.readApplication(STAGE_TEST_APP, null, null, null);
+    assertThat(testApp.getAppId()).isNull();
+    assertThat(testApp.getVersion()).isNull();
+
+    // should not throw exception
+    testApp.validateForStaging();
+  }
+
+  @Test
+  public void testReadApplicationForStagingWithAppIdAndVersionFromCommandLine() throws IOException {
+    Application testApp =
+        Application.readApplication(STAGE_TEST_APP, "a-override", null, "v-override");
+
+    // should not throw exception
+    testApp.validateForStaging();
+  }
+
+  //TODO(ludo)  @Test
+  public void testReadApplicationForStagingWithAppIdAndVersionFromFile() throws IOException {
+    Application testApp =
+        Application.readApplication(STAGE_WITH_APPID_AND_VERSION_TEST_APP, null, null, null);
+
+    // should not throw exception
+    testApp.validateForStaging();
+  }
+
+  @Test
+  public void testStagingWithFiles() throws Exception {
+    Application testApp = Application.readApplication(TEST_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(StagingOptions.builder().setSplitJarFiles(Optional.of(true)).build());
+
+    testApp.createStagingDirectory(opts);
+    testStagedFiles(testApp);
+    File stage = testApp.getStagingDir();
+    // Does not work when you are on github automation 
+    // assertThat(new File(stage, "WEB-INF/classes/source-context.json").canRead()).isFalse();
+    File appYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(appYaml, "application: 'sampleapp'");
+    assertFileContains(appYaml, "\nversion: '1'");
+  }
+
+  @Test
+  public void testStagingWithRelativeFiles() throws Exception {
+    // If this assumption is false, presumably we're on Windows somehow, and our fabricated
+    // relative path probably won't work because of those stupid C: drive letter things.
+    assumeTrue(File.separatorChar == '/');
+    String currentDirAbsolute = Paths.get("").toAbsolutePath().toString();
+    assertThat(currentDirAbsolute).startsWith("/");
+    String currentDirToRoot = currentDirAbsolute.substring(1).replaceAll("([^/]+)", "..");
+    assertThat(TEST_FILES).startsWith("/");
+    String testFilesRelative = currentDirToRoot + TEST_FILES;
+    assertThat(new File(testFilesRelative).isDirectory()).isTrue();
+    Application testApp = Application.readApplication(testFilesRelative);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(StagingOptions.builder().setSplitJarFiles(Optional.of(true)).build());
+
+    testApp.createStagingDirectory(opts);
+    testStagedFiles(testApp);
+    File stage = testApp.getStagingDir();
+    // Does not work when you are on github automation 
+    // assertThat(new File(stage, "WEB-INF/classes/source-context.json").canRead()).isFalse();
+    File appYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(appYaml, "application: 'sampleapp'");
+    assertFileContains(appYaml, "\nversion: '1'");
+  }
+
+  @Test
+  public void testZipClassesDirectoryWithoutClasses() throws Exception {
+    Application testApp = Application.readApplication(TEST_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(
+        StagingOptions.builder()
+            .setSplitJarFiles(Optional.of(true))
+            .setJarClasses(Optional.of(true))
+            .build());
+
+    testApp.createStagingDirectory(opts);
+    testStagedFiles(testApp);
+    File stage = testApp.getStagingDir();
+    File appYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(appYaml, "application: 'sampleapp'");
+  }
+
+  /**
+   * The sane staging defaults split jars and jars classes, hence re-using logic from the above test
+   * (testZipClassesDirectoryWithoutClasses).
+   */
+  @Test
+  public void testSaneStagingDefaults() throws Exception {
+    Application testApp = Application.readApplication(TEST_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setDefaultStagingOptions(StagingOptions.SANE_DEFAULTS);
+ 
+    testApp.createStagingDirectory(opts);
+    testStagedFiles(testApp);
+    File stage = testApp.getStagingDir();
+    File appYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(appYaml, "application: 'sampleapp'");
+  }
+
+  @Test
+  public void testStagingWithSourceContext() throws Exception {
+    RepoInfo.SourceContext testSourceContext =
+        RepoInfo.SourceContext.createFromUrl(
+            "https://source.developers.google.com/p/testing/r/default", "dummyrevision");
+    String testSourceContextJson =
+        "{\"cloudRepo\": {\"repoId\": {\"projectRepoId\":"
+            + " {\"projectId\": \"testing\", \"repoName\": \"default\"}},"
+            + " \"revisionId\": \"dummyrevision\"}}";
+    Application testApp = Application.readApplication(TEST_FILES, testSourceContext);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(StagingOptions.builder().setSplitJarFiles(Optional.of(true)).build());
+
+    testApp.createStagingDirectory(opts);
+    testStagedFiles(testApp);
+    File stage = testApp.getStagingDir();
+    File jsonFile = new File(stage, "WEB-INF/classes/source-context.json");
+    assertThat(jsonFile.isFile()).isTrue();
+    String contents = Files.asCharSource(jsonFile, StandardCharsets.UTF_8).read();
+    assertThat(testSourceContextJson).isEqualTo(contents);
+    File appYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(appYaml, "application: 'sampleapp'");
+    assertFileContains(appYaml, "\nversion: '1'");
+  }
+
+  @Test
+  public void testStagingForGcloudWithFilesAndConfigErasure() throws Exception {
+    Application testApp = Application.readApplication(TEST_FILES, null, null, null);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    testApp.validateForStaging();
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(StagingOptions.builder().setSplitJarFiles(Optional.of(true)).build());
+
+    File stagingDir = testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
+    testStagedFiles(testApp);
+    // user staging copies yaml files from appengine-generated into the root
+    File copiedAppYaml = new File(stagingDir, "app.yaml");
+    File originalAppYaml = new File(stagingDir, "WEB-INF/appengine-generated/app.yaml");
+    assertThat(copiedAppYaml.canRead()).isTrue();
+
+    // the copied app.yaml is the original with a precautionary new line and an
+    // extra 'skip_files' line.
+    List<String> expectedCopiedAppYaml = Files.readLines(originalAppYaml, UTF_8);
+    expectedCopiedAppYaml.add("");
+    expectedCopiedAppYaml.add("skip_files: app.yaml");
+    assertThat(Files.readLines(copiedAppYaml, UTF_8)).isEqualTo(expectedCopiedAppYaml);
+
+    String yamlString = Files.asCharSource(copiedAppYaml, UTF_8).read();
+    assertThat(yamlString.startsWith("application:")).isFalse();
+    assertThat(yamlString).doesNotContain("\napplication:");
+    assertThat(yamlString.startsWith("version:")).isFalse();
+    assertThat(yamlString).doesNotContain("\nversion:");
+    assertFileContains(copiedAppYaml, "\nskip_files: app.yaml");
+  }
+
+  private static void testStagedFiles(Application testApp) throws Exception {
+    File stage = testApp.getStagingDir();
+    File html = new File(stage, "__static__/random.html");
+    assertWithMessage("Can read " + html).that(html.canRead()).isTrue();
+    assertThat(html.length()).isEqualTo(RANDOM_HTML_SIZE);
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    File jspJar = new File(stage, "WEB-INF/lib/_ah_compiled_jsps-0000.jar");
+    assertThat(jspJar.exists()).isTrue();
+    // Test that the classes in the generated jar are for Java8.
+    assertThat(getJavaJarVersion(jspJar)).isEqualTo(8);
+    checkIfEntryIsInJarFile(jspJar, "org/apache/jsp/nested/testing_jsp.class");
+    assertThat(new File(stage, "nested/dukebanner.html").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/lib").isDirectory()).isTrue();
+    File appYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertThat(Files.asCharSource(appYaml, UTF_8).read()).contains("api_version: 'user_defined'");
+  }
+
+  //TODO(ludo) @Test
+  public void testStageForGcloudOnlyCopyAppYamlToRoot() throws IOException {
+    Application testApp =
+        Application.readApplication(getWarPath("stage-with-all-xmls"), null, null, null);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    File stagingDir = testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
+    File generationDir = GenerationDirectory.getGenerationDirectory(stagingDir);
+
+    assertThat(new File(generationDir, "app.yaml").exists()).isTrue();
+    assertThat(new File(stagingDir, "app.yaml").exists()).isTrue();
+
+    assertThat(new File(generationDir, "cron.yaml").exists()).isTrue();
+    assertThat(new File(stagingDir, "cron.yaml").exists()).isFalse();
+
+    assertThat(new File(generationDir, "dispatch.yaml").exists()).isTrue();
+    assertThat(new File(stagingDir, "dispatch.yaml").exists()).isFalse();
+
+    assertThat(new File(generationDir, "dos.yaml").exists()).isTrue();
+    assertThat(new File(stagingDir, "dos.yaml").exists()).isFalse();
+
+    assertThat(new File(generationDir, "index.yaml").exists()).isTrue();
+    assertThat(new File(stagingDir, "index.yaml").exists()).isFalse();
+
+    assertThat(new File(generationDir, "queue.yaml").exists()).isTrue();
+    assertThat(new File(stagingDir, "queue.yaml").exists()).isFalse();
+  }
+
+  //TODO(ludo) @Test
+  public void testDoNotStageDispatchForUpdate() throws IOException {
+    Application testApp =
+        Application.readApplication(getWarPath("sample-dispatch"), null, null, null);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    File stagingDir = testApp.createStagingDirectory(opts);
+
+    File dispatchYaml = new File(stagingDir, "dispatch.yaml");
+    assertThat(dispatchYaml.exists()).isFalse();
+  }
+
+  @Test
+  public void testAppEngineApiJarIncluded() throws Exception {
+    File tmpDir = Files.createTempDir();
+    try {
+      doTestAppEngineApiJarIncluded(tmpDir, "impl", "lib/impl/appengine-api.jar");
+    } finally {
+      MoreFiles.deleteRecursively(tmpDir.toPath());
+    }
+  }
+
+  private static void doTestAppEngineApiJarIncluded(File tmpDir, String testName, String apiJarPath)
+      throws Exception {
+    File sdkRoot = new File(SDK_ROOT);
+    File apiJar = new File(sdkRoot, apiJarPath);
+    assertWithMessage(apiJar.toString()).that(apiJar.exists()).isTrue();
+    //TODO(ludo)  File remoteApiJar = new File(sdkRoot, "lib/appengine-remote-api.jar");
+    //TODO(ludo) assertWithMessage(remoteApiJar.toString()).that(remoteApiJar.exists()).isTrue();
+    File testDir = new File(tmpDir, testName);
+    File webInf = new File(testDir, "WEB-INF");
+    File webInfLib = new File(webInf, "lib");
+    boolean madeWebInfLib = webInfLib.mkdirs();
+    assertThat(madeWebInfLib).isTrue();
+    Files.copy(apiJar, new File(webInfLib, "appengine-api.jar"));
+    //TODO(ludo) Files.copy(remoteApiJar, new File(webInfLib, "appengine-remote-api.jar"));
+    File testAppRoot = new File(TEST_FILES);
+    Files.copy(new File(testAppRoot, "WEB-INF/web.xml"), new File(webInf, "web.xml"));
+    Files.copy(
+        new File(testAppRoot, "WEB-INF/appengine-web.xml"), new File(webInf, "appengine-web.xml"));
+
+    Application application = Application.readApplication(testDir.getAbsolutePath());
+    application.setDetailsWriter(new PrintWriter(new OutputStreamWriter(System.out, UTF_8)));
+
+    assertThat(application.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    application.createStagingDirectory(opts);
+    File stage = application.getStagingDir();
+    File appYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(appYaml, "api_version: 'user_defined'");
+    File stagedApiJar = new File(stage, "WEB-INF/lib/appengine-api.jar");
+    assertWithMessage(stagedApiJar.toString()).that(stagedApiJar.exists()).isTrue();
+    byte[] originalApiJarBytes = Files.toByteArray(apiJar);
+    byte[] stagedApiJarBytes = Files.toByteArray(stagedApiJar);
+    assertThat(originalApiJarBytes).isEqualTo(stagedApiJarBytes);
+  }
+
+  @Test
+  public void testStagingJava8() throws Exception {
+    Application testApp = Application.readApplication(TEST_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-generated/app.yaml").canRead()).isTrue();
+    assertFileContains(new File(stage, "WEB-INF/appengine-generated/app.yaml"), "runtime: java8\n");
+  }
+
+  @Test
+  public void testStagingJava11() throws Exception {
+    Application testApp = Application.readApplication(TEST_JAVA11);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-generated/app.yaml").canRead()).isTrue();
+    File generatedAppYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(generatedAppYaml, "runtime: java11\n");
+    assertFileContains(generatedAppYaml, "runtime_channel: canary\n");
+    assertFileContains(generatedAppYaml, "entrypoint: 'java -jar foo.jar'\n");
+  }
+
+  @Test
+  public void testStagingJava17() throws Exception {
+    Application testApp = Application.readApplication(TEST_JAVA17);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-generated/app.yaml").canRead()).isTrue();
+    File generatedAppYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(generatedAppYaml, "runtime: java17\n");
+    assertFileContains(generatedAppYaml, "runtime_channel: canary\n");
+    assertFileContains(generatedAppYaml, "entrypoint: 'java -jar foo.jar'\n");
+  }
+
+  @Test
+  public void testJspCompilerJava8() throws Exception {
+    Application testApp = Application.readApplication(SERVLET3_STANDARD_APP_ROOT);
+    assertThat(testApp.getJSPCClassName())
+        .contains("com.google.appengine.tools.development.jetty");
+     assertThat(testApp.getJSPCClassName())
+        .contains("LocalJspC");
+  }
+
+  @Test
+  public void testStagingJava8RuntimeJava8JarFile() throws Exception {
+    Application testApp = Application.readApplication(JAVA8_JAR_TEST_FILES);
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setAllowAnyRuntime(true);
+    opts.setRuntime("java8");
+    File stage = testApp.createStagingDirectory(opts);
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-generated/app.yaml").canRead()).isTrue();
+    assertFileContains(new File(stage, "WEB-INF/appengine-generated/app.yaml"), "runtime: java8\n");
+  }
+
+  @Test
+  public void testStagingManuallySetUnsupportedRuntime() throws IOException {
+    try {
+      Application testApp = Application.readApplication(TEST_FILES);
+      testApp.setDetailsWriter(
+          new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+      assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+      ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+      opts.setRuntime("foo");
+
+      testApp.createStagingDirectory(opts);
+      fail("Did not get expected AppEngineConfigException");
+    } catch (AppEngineConfigException expected) {
+      // Expect an exception flagging the runtime id as invalid.
+      assertThat(expected).hasMessageThat().contains("Invalid runtime id: foo");
+    }
+  }
+
+  @Test
+  public void testStagingManuallySetUnsupportedRuntimeAllowAnyRuntime() throws Exception {
+    Application testApp = Application.readApplication(TEST_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setRuntime("foo");
+    opts.setAllowAnyRuntime(true);
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-generated/app.yaml").canRead()).isTrue();
+    assertFileContains(new File(stage, "WEB-INF/appengine-generated/app.yaml"), "runtime: foo\n");
+  }
+
+  private static void assertFileContains(File file, String expectedSubstring) throws Exception {
+    String contentsAsString = Files.asCharSource(file, UTF_8).read();
+    assertThat(contentsAsString).contains(expectedSubstring);
+  }
+
+  @Test
+  public void testWithJspx() throws IOException {
+    Application testApp = Application.readApplication(TEST_JSPX_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(StagingOptions.builder().setSplitJarFiles(Optional.of(true)).build());
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    File html = new File(stage, "__static__/random.html");
+    assertThat(html.canRead()).isTrue();
+    assertThat(html.length()).isEqualTo(RANDOM_HTML_SIZE);
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    checkIfEntryIsInJarFile(
+        new File(stage, "WEB-INF/lib/_ah_compiled_jsps-0000.jar"),
+        "org/apache/jsp/nested/testing_jspx.class");
+    assertThat(new File(stage, "nested/dukebanner.html").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/lib").isDirectory()).isTrue();
+  }
+
+ /* @Test
+  public void testWithBigJarWithTlds() throws Exception {
+    Application testApp =
+        Application.readApplication(
+            TestUtil.getSrcDir()
+                + "/google3/javatests/com/google/appengine/tools/admin/deploy_fileset_big_jar_tld");
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(StagingOptions.builder().setSplitJarFiles(Optional.of(true)).build());
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/lib").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/lib/bigjar_with_tlds-0000.jar").canRead()).isTrue();
+    //    checkIfEntryIsInJarFile(new File(stage, "WEB-INF/lib/bigjar_with_tlds-0000.jar"),
+    //       "META-INF/fn.tl");
+
+    File quickstartXml = new File(stage, "WEB-INF/quickstart-web.xml");
+
+    assertThat(quickstartXml.canRead()).isTrue();
+
+    Document quickstartDoc =
+        DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(quickstartXml);
+    // We want to verify that the list of tlds defined by:
+    // <context-param>
+    //   <param-value><![CDATA[
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/fmt-1_0-rt.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/fmt.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/c.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/permittedTaglibs.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/x-1_0.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/fn.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/sql-1_0.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/fmt-1_0.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/sql-1_0-rt.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/x.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/scriptfree.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/c-1_0.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/sql.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/c-1_0-rt.tld",
+    //    "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-0163.jar!/META-INF/x-1_0-rt.tld"
+    //       ...
+    // We are not sure about the number of split jars, we just need to check if an entry
+    // contains "jar:${WAR.uri}/WEB-INF/lib/bigjar_with_tlds-" and ".jar!/META-INF/fmt.tld"
+
+    NodeList nodeList = quickstartDoc.getElementsByTagName("context-param");
+    boolean match = false;
+    for (int i = 0; i < nodeList.getLength(); i++) {
+      Node contextParam = nodeList.item(i).getFirstChild();
+      do {
+        String nodeName = contextParam.getNodeName();
+        if (nodeName.equals("param-value")) {
+          String content = contextParam.getFirstChild().getTextContent();
+          if (content.contains("bigjar_with_tlds")) {
+
+            match |= CONTENT_PATTERN.matcher(content).find();
+          }
+        }
+      } while ((contextParam = contextParam.getNextSibling()) != null);
+    }
+    assertThat(match).isTrue();
+  }
+  */
+
+  private static final Pattern CONTENT_PATTERN =
+      Pattern.compile(
+          "\"jar:\\$\\{WAR\\.uri}/WEB-INF/lib/bigjar_with_tlds"
+              + "-\\d.*\\.jar!/META-INF/fmt.tld\",?");
+
+  @Test
+  public void testJspWithTag() throws IOException {
+    Application testApp = Application.readApplication(TEST_TAGS_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    checkIfEntryIsInJarFile(
+        new File(stage, "WEB-INF/lib/_ah_compiled_jsps-0000.jar"),
+        "org/apache/jsp/nested/message_jsp.class");
+    checkIfEntryIsInJarFile(
+        new File(stage, "WEB-INF/lib/_ah_compiled_jsps-0000.jar"),
+        "org/apache/jsp/tag/web/ui/page_tag.class");
+    assertThat(new File(stage, "nested/message.jsp").canRead()).isTrue();
+  }
+
+  @Test
+  public void testJspWithTagOnJava8gStandardRuntime() throws Exception {
+
+    doTestJspWithRuntime("java8g");
+  }
+
+  @Test
+  public void testJspWithTagOnJava8StandardRuntime() throws Exception {
+
+    doTestJspWithRuntime("java8");
+  }
+
+  private static void doTestJspWithRuntime(String runtime) throws Exception {
+    Application testApp = Application.readApplication(TEST_TAGS_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    opts.setRuntime(runtime);
+    opts.setAllowAnyRuntime(true);
+    // do not jar the generated classes for JSPs.
+    opts.setStagingOptions(StagingOptions.builder().setJarJsps(Optional.of(false)).build());
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    File appYaml = new File(stage, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(appYaml, "runtime: " + runtime);
+
+    assertThat(new File(stage, "nested/message.jsp").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    File class1 = new File(stage, "WEB-INF/classes/org/apache/jsp/nested/message_jsp.class");
+    assertThat(class1.exists()).isTrue();
+
+    File class2 = new File(stage, "WEB-INF/classes/org/apache/jsp/tag/web/ui/page_tag.class");
+    assertThat(class2.exists()).isTrue();
+    File genCodeDir = testApp.getJspJavaFilesGeneratedTempDirectory();
+    File servlet2 = new File(genCodeDir, "org/apache/jsp/tag/web/ui/page_tag.java");
+    assertThat(servlet2.exists()).isTrue();
+    assertThat(Files.asCharSource(servlet2, UTF_8).read())
+        .contains("* Version: JspC/ApacheTomcat");
+  }
+
+  @Test
+  public void testDeleteJSPs() throws IOException {
+    Application testApp = Application.readApplication(TEST_TAGS_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(StagingOptions.builder().setDeleteJsps(Optional.of(true)).build());
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    checkIfEntryIsInJarFile(
+        new File(stage, "WEB-INF/lib/_ah_compiled_jsps-0000.jar"),
+        "org/apache/jsp/nested/message_jsp.class");
+    checkIfEntryIsInJarFile(
+        new File(stage, "WEB-INF/lib/_ah_compiled_jsps-0000.jar"),
+        "org/apache/jsp/tag/web/ui/page_tag.class");
+    assertThat(new File(stage, "nested/message.jsp").exists()).isFalse();
+  }
+
+  @Test
+  public void testDoNotJarJSPs() throws IOException {
+    Application testApp = Application.readApplication(TEST_TAGS_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(StagingOptions.builder().setJarJsps(Optional.of(false)).build());
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/classes/org/apache/jsp/nested/message_jsp.class").exists())
+        .isTrue();
+    assertThat(new File(stage, "WEB-INF/lib/_ah_compiled_jsps-0000.jar").exists()).isFalse();
+    assertThat(new File(stage, "nested/message.jsp").exists()).isTrue();
+  }
+
+  @Test
+  public void testErrorInTagFile() throws IOException {
+    Application testApp = Application.readApplication(TEST_ERROR_IN_TAGS_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    JspCompilationException exception =
+        assertThrows(JspCompilationException.class, () -> testApp.createStagingDirectory(opts));
+    assertThat(exception).hasMessageThat().isEqualTo("Failed to compile jsp files.");
+  }
+
+  @Test
+  public void testZipClassesWithoutJSPs() throws IOException {
+    Application testApp = Application.readApplication(CLASSES_TEST_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+    assertThat(testApp.getAppId()).isEqualTo(APPID);
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    opts.setStagingOptions(StagingOptions.builder().setJarClasses(Optional.of(true)).build());
+
+    testApp.createStagingDirectory(opts);
+    File stage = testApp.getStagingDir();
+    assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
+    assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
+    assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
+    checkIfEntryIsInJarFile(
+        new File(stage, "WEB-INF/lib/_ah_webinf_classes-0000.jar"), "foo/AClass.class");
+    assertThat(new File(stage, "WEB-INF/classes/foo/AClass.class").exists()).isFalse();
+  }
+
+  /**
+   * Check that precedence is respected, where defaults, appengine-web.xml and flags are applied in
+   * order. Flags have the highest precedence.
+   *
+   * <pre>
+   * Defaults are:
+   * - splitJarFiles: false
+   * - splitJarFilesExcludes: {} (empty set)
+   * - jarJsps: true
+   * - jarClasses: false
+   * - deleteJsps: false
+   * - compileEncoding: "UTF-8"
+   *
+   * Sample app's appengine-web.xml:
+   * - splitJarFilesExcludes: {"foo", "bar"}
+   * - deleteJsps: true
+   * - compileEncoding: "UTF-16"
+   *
+   * Flags (populated through ApplicationProcessingOptions):
+   * - splitJarFiles: true
+   * - splitJarFilesExcludes: {"baz"}
+   * - deleteJsps: false
+   *
+   * Expected result:
+   * - splitJarFiles: true
+   * - splitJarFilesExcludes: {"baz"}
+   * - jarJsps: true
+   * - jarClasses: false
+   * - deleteJsps: false
+   * - compileEncoding: "UTF-16"
+   * </pre>
+   */
+  @Test
+  public void testStagingOptionPrecedence() throws IOException {
+    Application testApp = Application.readApplication(STAGE_WITH_STAGING_OPTIONS);
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    // These correspond to the flags passed in to AppCfg
+    opts.setStagingOptions(
+        StagingOptions.builder()
+            .setSplitJarFiles(Optional.of(true))
+            .setSplitJarFilesExcludes(Optional.of(ImmutableSortedSet.of("baz")))
+            .setDeleteJsps(Optional.of(false))
+            .build());
+
+    StagingOptions expected =
+        StagingOptions.builder()
+            .setSplitJarFiles(Optional.of(true))
+            .setSplitJarFilesExcludes(Optional.of(ImmutableSortedSet.of("baz")))
+            .setJarJsps(Optional.of(true))
+            .setJarClasses(Optional.of(false))
+            .setDeleteJsps(Optional.of(false))
+            .setCompileEncoding(Optional.of("UTF-16"))
+            .build();
+
+    assertThat(testApp.getStagingOptions(opts)).isEqualTo(expected);
+  }
+
+  @Test
+  public void testWriteDefaultWebXml() throws IOException {
+    File tempAppDir = temporaryFolder.newFolder();
+    File webinfFile = new File(tempAppDir, "WEB-INF");
+    AppEngineConfigException exception =
+        assertThrows(
+            AppEngineConfigException.class,
+            () -> Application.readApplication(tempAppDir.toString()));
+    String expectedMessage =
+        "Could not find the WEB-INF directory in "
+            + webinfFile
+            + ". The given application file path must point to an exploded WAR directory that"
+            + " contains a WEB-INF directory.";
+    assertThat(exception).hasMessageThat().isEqualTo(expectedMessage);
+    webinfFile.mkdir();
+    Files.asCharSink(new File(webinfFile, "appengine-web.xml"), UTF_8)
+        .write(APPENGINE_WEB_XML_CONTENT);
+    File webXmlFile = new File(webinfFile, "web.xml");
+    assertThat(webXmlFile.exists()).isFalse();
+    try {
+      Application.readApplication(tempAppDir.toString());
+      assertThat(webXmlFile.canRead()).isTrue();
+      assertThat(Files.asCharSource(webXmlFile, UTF_8).read())
+          .isEqualTo(Application.DEFAULT_WEB_XML_CONTENT);
+    } finally {
+      deleteRecursively(tempAppDir.toPath());
+    }
+  }
+
+  private static void deleteRecursively(Path path) throws IOException {
+    java.nio.file.Files.walkFileTree(
+        path,
+        new SimpleFileVisitor<Path>() {
+          @Override
+          public FileVisitResult postVisitDirectory(Path directory, IOException exc)
+              throws IOException {
+            java.nio.file.Files.delete(directory);
+            return FileVisitResult.CONTINUE;
+          }
+
+          @Override
+          public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+              throws IOException {
+            java.nio.file.Files.delete(file);
+            return FileVisitResult.CONTINUE;
+          }
+        });
+  }
+
+  @Test
+  public void testXmlValidation() throws IOException {
+    Application testApp = Application.readApplication(XMLORDERING_TEST_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    try {
+      testApp = Application.readApplication(BAD_WEBXML_TEST_FILES);
+      fail("Bad web.xml wasn't detected");
+    } catch (AppEngineConfigException ex) {
+      // good
+    }
+    try {
+      testApp = Application.readApplication(BAD_APPENGINEWEBXML_TEST_FILES);
+      fail("Bad appengine-web.xml wasn't detected");
+    } catch (AppEngineConfigException ex) {
+      // good
+    }
+    try {
+      testApp = Application.readApplication(BAD_INDEXESXML_TEST_FILES);
+      fail("Bad datastore-indexes.xml wasn't detected");
+    } catch (AppEngineConfigException ex) {
+      // good
+    }
+    try {
+      testApp = Application.readApplication(BAD_CRONXML_TEST_FILES);
+      fail("Bad datastore-indexes.xml wasn't detected");
+    } catch (AppEngineConfigException ex) {
+      // good
+    }
+  }
+
+  @Test
+  public void testBadRuntimeChannel() throws IOException {
+    try {
+      Application.readApplication(BAD_RUNTIME_CHANNEL);
+      fail("iappengine-web.xml content was incorrectly accepted with a runtime-channel.");
+    } catch (AppEngineConfigException ex) {
+      assertThat(ex)
+          .hasMessageThat()
+          .isEqualTo("'runtime-channel' is not valid with this runtime.");
+    }
+  }
+
+  @Test
+  public void testBadEntrypoint() throws IOException {
+    try {
+      Application.readApplication(BAD_ENTRYPOINT);
+      fail("appengine-web.xml content was incorrectly accepted with an entrypoint.");
+    } catch (AppEngineConfigException ex) {
+      assertThat(ex).hasMessageThat().isEqualTo("'entrypoint' is not valid with this runtime.");
+    }
+  }
+
+  @Test
+  public void testCronEntries() throws IOException {
+    Application testApp = Application.readApplication(TEST_FILES);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+    CronXml cron = testApp.getCronXml();
+    assertWithMessage("App without cron entries should have null getCronXml()").that(cron).isNull();
+
+    testApp = Application.readApplication(NOJSP_TEST_FILES);
+    cron = testApp.getCronXml();
+    assertThat(cron.getEntries()).isEmpty();
+
+    testApp = Application.readApplication(XMLORDERING_TEST_FILES);
+    cron = testApp.getCronXml();
+    List<CronXml.Entry> entries = cron.getEntries();
+    assertThat(entries).hasSize(2);
+    assertThat(entries.get(0).getTimezone()).isEqualTo("HST");
+    assertThat(entries.get(0).getSchedule()).isEqualTo("every 2 hours");
+    assertThat(entries.get(0).getUrl()).isEqualTo("http://nowhere/fast");
+    assertThat(entries.get(0).getDescription()).isEmpty();
+    assertThat(entries.get(1).getTimezone()).isEqualTo("UTC");
+    assertThat(entries.get(1).getSchedule()).isEqualTo("every 3 hours");
+    assertThat(entries.get(1).getUrl()).isEqualTo("http://nowhere");
+    assertThat(entries.get(1).getDescription()).isEqualTo("Why it's here");
+  }
+
+  @Test
+  public void testCronRetryParameterEntries() throws IOException {
+    Application testApp = Application.readApplication(CRON_RETRY_PARAMETERS_TEST_FILES);
+    CronXml cron = testApp.getCronXml();
+    assertWithMessage("Application should contain cron entries.").that(cron).isNotNull();
+    List<CronXml.Entry> entries = cron.getEntries();
+    assertThat(entries).hasSize(4);
+
+    // all entries should exist for entry 0
+    RetryParametersXml retryParameters = entries.get(0).getRetryParameters();
+    assertThat(retryParameters.getRetryLimit().intValue()).isEqualTo(3);
+    assertThat(retryParameters.getAgeLimitSec().intValue()).isEqualTo(60 * 60 * 24 * 2);
+    assertThat(retryParameters.getMinBackoffSec()).isEqualTo(2.4);
+    assertThat(retryParameters.getMaxBackoffSec()).isEqualTo(10.5);
+    assertThat(retryParameters.getMaxDoublings().intValue()).isEqualTo(4);
+
+    // only retry limit should be set for entry 1
+    retryParameters = entries.get(1).getRetryParameters();
+    assertThat(retryParameters.getRetryLimit().intValue()).isEqualTo(2);
+    assertThat(retryParameters.getAgeLimitSec()).isNull();
+    assertThat(retryParameters.getMinBackoffSec()).isNull();
+    assertThat(retryParameters.getMaxBackoffSec()).isNull();
+    assertThat(retryParameters.getMaxDoublings()).isNull();
+
+    // no parameters should be set for entry 2
+    retryParameters = entries.get(2).getRetryParameters();
+    assertThat(retryParameters.getRetryLimit()).isNull();
+    assertThat(retryParameters.getAgeLimitSec()).isNull();
+    assertThat(retryParameters.getMinBackoffSec()).isNull();
+    assertThat(retryParameters.getMaxBackoffSec()).isNull();
+    assertThat(retryParameters.getMaxDoublings()).isNull();
+
+    // no retry parameters should exist for entry 3
+    retryParameters = entries.get(3).getRetryParameters();
+    assertThat(retryParameters).isNull();
+  }
+
+  @Test
+  public void testCronRetryParameterNegativeRetryLimit() throws IOException {
+    AppEngineConfigException aece =
+        assertThrows(
+            AppEngineConfigException.class,
+            () -> Application.readApplication(CRON_NEGATIVE_RETRY_LIMIT_TEST_FILES));
+    assertThat(aece).hasMessageThat().contains("XML error");
+    assertThat(aece).hasCauseThat().hasMessageThat().contains("'-3'");
+  }
+
+  @Test
+  public void testCronRetryParameterNegativeMaxBackoff() throws IOException {
+    AppEngineConfigException aece =
+        assertThrows(
+            AppEngineConfigException.class,
+            () -> Application.readApplication(CRON_NEGATIVE_MAX_BACKOFF_TEST_FILES));
+    assertThat(aece).hasMessageThat().contains("XML error");
+    assertThat(aece).hasCauseThat().hasMessageThat().contains("'-10.5'");
+  }
+
+  @Test
+  public void testCronRetryParameterBadAgeLimit() throws IOException {
+    AppEngineConfigException aece =
+        assertThrows(
+            AppEngineConfigException.class,
+            () -> Application.readApplication(CRON_BAD_AGE_LIMIT_TEST_FILES));
+    assertThat(aece).hasMessageThat().contains("XML error");
+    assertThat(aece).hasCauseThat().hasMessageThat().contains("'2x'");
+  }
+
+  @Test
+  public void testCronRetryParameterTwoMaxDoublings() throws IOException {
+    AppEngineConfigException aece =
+        assertThrows(
+            AppEngineConfigException.class,
+            () -> Application.readApplication(CRON_TWO_MAX_DOUBLINGS_TEST_FILES));
+    assertThat(aece).hasMessageThat().contains("XML error");
+    assertThat(aece).hasCauseThat().hasMessageThat().contains("'max-doublings'");
+  }
+
+  @Test
+  public void testRuntime() throws IOException {
+    Application testApp = Application.readApplication(TEST_FILES_RUNTIME_DEFINED);
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    testApp.createStagingDirectory(opts);
+    assertThat(testApp.getRuntime()).isEqualTo("foo-bar");
+  }
+
+  @Test
+  public void testServer() throws IOException {
+    Application testApp = Application.readApplication(TEST_FILES_AUTOMATIC_MODULE);
+    assertThat(testApp.getModule()).isEqualTo("stan");
+    assertThat(testApp.getInstanceClass()).isEqualTo("F8");
+    AppEngineWebXml.AutomaticScaling settings = testApp.getAppEngineWebXml().getAutomaticScaling();
+    assertThat(settings.isEmpty()).isFalse();
+    assertThat(settings.getMinPendingLatency()).isEqualTo("10.5s");
+    assertThat(settings.getMaxPendingLatency()).isEqualTo("10900ms");
+    assertThat(settings.getMinIdleInstances()).isEqualTo("automatic");
+    assertThat(settings.getMaxIdleInstances()).isEqualTo("10");
+    assertThat(settings.getMaxConcurrentRequests()).isEqualTo("20");
+  }
+
+  @Test
+  public void testManualServer() throws IOException {
+    Application testApp = Application.readApplication(TEST_FILES_MANUAL_MODULE);
+    assertThat(testApp.getModule()).isEqualTo("stan");
+    assertThat(testApp.getInstanceClass()).isEqualTo("B8");
+    AppEngineWebXml.ManualScaling settings = testApp.getAppEngineWebXml().getManualScaling();
+    assertThat(settings.isEmpty()).isFalse();
+    assertThat(settings.getInstances()).isEqualTo("10");
+  }
+
+  @Test
+  public void testBasicServer() throws IOException {
+    Application testApp = Application.readApplication(TEST_FILES_BASIC_MODULE);
+    assertThat(testApp.getModule()).isEqualTo("stan");
+    assertThat(testApp.getInstanceClass()).isEqualTo("B8");
+    AppEngineWebXml.BasicScaling settings = testApp.getAppEngineWebXml().getBasicScaling();
+    assertThat(settings.isEmpty()).isFalse();
+    assertThat(settings.getMaxInstances()).isEqualTo("11");
+    assertThat(settings.getIdleTimeout()).isEqualTo("10m");
+
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    File stagingDir = testApp.createStagingDirectory(opts);
+  }
+
+  @Test
+  public void testIncludeHttpHeaders() throws IOException {
+    Application testApp = Application.readApplication(INCLUDE_HTTP_HEADERS_TEST_FILES);
+    List<AppEngineWebXml.StaticFileInclude> includes =
+        testApp.getAppEngineWebXml().getStaticFileIncludes();
+
+    assertThat(includes).hasSize(1);
+
+    Map<String, String> httpHeaders = includes.get(0).getHttpHeaders();
+    assertThat(httpHeaders).hasSize(2);
+    assertThat(httpHeaders.get("P3P")).isEqualTo("P3P header value");
+    assertThat(httpHeaders.get("Access-Control-Allow-Origin")).isEqualTo("http://example.org");
+  }
+
+  //TODO(ludo ) @Test
+  public void testDispatch() throws IOException {
+    Application testApp = Application.readApplication(getWarPath("sample-dispatch"));
+    String expectYaml = "dispatch:\n" + "- url: '*/userapp/*'\n" + "  module: web\n";
+    assertThat(testApp.getDispatchXml().toYaml()).isEqualTo(expectYaml);
+  }
+
+  //TODO(ludo ) @Test
+  public void testDispatch_yaml() throws IOException {
+    Application testApp = Application.readApplication(getWarPath("sample-dispatch-yaml"));
+    String expectYaml = "dispatch:\n" + "- url: '*/*'\n" + "  module: web\n";
+    assertThat(testApp.getDispatchXml().toYaml()).isEqualTo(expectYaml);
+  }
+
+  //TODO(ludo)  @Test
+  public void testDispatch_xmlAndYaml() throws IOException {
+    Application testApp = Application.readApplication(getWarPath("sample-dispatch-xml-and-yaml"));
+    String expectYaml = "dispatch:\n" + "- url: '*/userapp/*'\n" + "  module: web\n";
+    assertThat(testApp.getDispatchXml().toYaml()).isEqualTo(expectYaml);
+  }
+
+  @Test
+  public void testDispatch_invalidXml() throws IOException {
+    AppEngineConfigException aece =
+        assertThrows(
+            AppEngineConfigException.class,
+            () -> Application.readApplication(getWarPath("sample-baddispatch")));
+    assertThat(aece).hasMessageThat().contains("error validating");
+  }
+
+  @Test
+  public void testDispatch_invalidYaml() throws IOException {
+    AppEngineConfigException aece =
+        assertThrows(
+            AppEngineConfigException.class,
+            () -> Application.readApplication(getWarPath("sample-baddispatch-yaml")));
+    String expect =
+        "Unable to find property 'not-url' in "
+            + "com.google.apphosting.utils.config.DispatchYamlReader$DispatchYamlEntry";
+    assertThat(aece).hasMessageThat().isEqualTo(expect);
+  }
+
+  @Test
+  public void testDispatch_missing() throws IOException {
+    Application testApp = Application.readApplication(TEST_FILES_BACKENDS);
+    assertThat(testApp.getDispatchXml()).isNull();
+  }
+
+
+  @Test
+  public void testUseJava8Standard() throws Exception {
+    Application testApp = Application.readApplication(SERVLET3_STANDARD_APP_ROOT);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(SERVLET3_APP_ID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    
+    File stageDir = testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
+    File appYaml = new File(stageDir, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(appYaml, "runtime: java8");
+    // See if the index.jsp file has been pre-compiled:
+    File jspJar = new File(stageDir, "WEB-INF/lib/_ah_compiled_jsps-0000.jar");
+    assertThat(jspJar.exists()).isTrue();
+    // Test that the classes in the generated jar are for Java8.
+    assertThat(getJavaJarVersion(jspJar)).isEqualTo(8);
+
+    // See if one of the Jetty9 or Jetty12  JSP jars is being added:
+    assertThat(
+              new File(stageDir, "WEB-INF/lib/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar")
+                      .exists()
+              // TODO need to extend for Jarkata APIs!
+              || new File(stageDir, "WEB-INF/lib/org.glassfish.web.javax.servlet.jsp.jstl-1.2.5.jar")
+                      .exists())
+            
+        .isTrue();
+  }
+
+  @Test
+  public void testStageGaeStandardJava8Servlet31QuickstartWebListenerMemcache()
+      throws IOException, ParserConfigurationException, SAXException {
+    Application testApp = Application.readApplication(SERVLET3_STANDARD_WEBLISTENER_MEMCACHE);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(SERVLET3_APP_ID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    File stageDir = testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
+
+    File quickstartXml = new File(stageDir, "WEB-INF/quickstart-web.xml");
+    File minQuickstartXml = new File(stageDir, "WEB-INF/min-quickstart-web.xml");
+
+    assertThat(quickstartXml.canRead()).isTrue();
+    assertThat(minQuickstartXml.canRead()).isTrue();
+
+    Document quickstartDoc =
+        DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(quickstartXml);
+    // No more CloudSqlConnectionCleanupFilter in 9.4 (defined as a RequestListener)
+    assertThat(
+            quickstartDoc.getDocumentElement().getElementsByTagName("filter-mapping").getLength())
+        .isEqualTo(0);
+    // No more default servlets in webdefault.xml, all defined inside our jetty 9.4 init code.
+    assertThat(
+            quickstartDoc.getDocumentElement().getElementsByTagName("servlet-mapping").getLength())
+        .isEqualTo(0);
+
+    Document minQuickstartDoc =
+        DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(minQuickstartXml);
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("filter-mapping")
+                .getLength())
+        .isEqualTo(0);
+
+    // 0 user defined annotated servlet in the SERVLET3_STANDARD_WEBLISTENER_MEMCACHE application.
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("servlet-mapping")
+                .getLength())
+        .isEqualTo(0);
+
+    // 1 user defined annotated weblistener in the SERVLET3_STANDARD_WEBLISTENER_MEMCACHE
+    // application.
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("listener-class")
+                .getLength())
+        .isEqualTo(1);
+
+    // We should not see any welcome-file entries:
+    assertThat(
+            minQuickstartDoc.getDocumentElement().getElementsByTagName("welcome-file").getLength())
+        .isEqualTo(0);
+
+    // We should not see any security-constraint entries:
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("security-constraint")
+                .getLength())
+        .isEqualTo(0);
+  }
+
+  @Test
+  public void testStageGaeStandardJava8Servlet31QuickstartWithoutJSP()
+      throws IOException, ParserConfigurationException, SAXException {
+    Application testApp = Application.readApplication(SERVLET3_STANDARD_APP_NO_JSP_ROOT);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(SERVLET3_APP_ID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    File stageDir = testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
+
+    File quickstartXml = new File(stageDir, "WEB-INF/quickstart-web.xml");
+    File minQuickstartXml = new File(stageDir, "WEB-INF/min-quickstart-web.xml");
+
+    assertThat(quickstartXml.canRead()).isTrue();
+    assertThat(minQuickstartXml.canRead()).isTrue();
+
+    Document quickstartDoc =
+        DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(quickstartXml);
+    assertThat(
+            quickstartDoc.getDocumentElement().getElementsByTagName("filter-mapping").getLength())
+        .isEqualTo(0);
+    assertThat(
+            quickstartDoc.getDocumentElement().getElementsByTagName("servlet-mapping").getLength())
+        .isEqualTo(1);
+
+    Document minQuickstartDoc =
+        DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(minQuickstartXml);
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("filter-mapping")
+                .getLength())
+        .isEqualTo(0);
+    // 1 user defined annotated servlet in the SERVLET3_STANDARD_APP_NO_JSP_ROOT application.
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("servlet-mapping")
+                .getLength())
+        .isEqualTo(1);
+
+    // We should not see any welcome-file entries:
+    assertThat(
+            minQuickstartDoc.getDocumentElement().getElementsByTagName("welcome-file").getLength())
+        .isEqualTo(0);
+    // We should not see any security-constraint entries:
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("security-constraint")
+                .getLength())
+        .isEqualTo(0);
+
+    // We want to verify we do not have any TLDs and resourcesdefined from useless JSP jars:
+    // <context-param>
+    //    <param-name>org.eclipse.jetty.tlds</param-name>
+    //    <param-value><![CDATA[]]></param-value>
+    // </context-param>
+    // <context-param>
+    //   <param-name>org.eclipse.jetty.resources</param-name>
+    //   <param-value><![CDATA[]]></param-value>
+    // </context-param>
+    //  <context-param>
+    //   <param-name>org.eclipse.jetty.originAttribute</param-name>
+    //   <param-value>origin</param-value>
+    //  </context-param>
+
+    NodeList nodeList = quickstartDoc.getElementsByTagName("context-param");
+    assertThat(nodeList.getLength()).isEqualTo(3);
+    for (int i = 0; i < nodeList.getLength(); i++) {
+      Node contextParam = nodeList.item(i).getFirstChild();
+      int nbParamValue = 0;
+      do {
+        String nodeName = contextParam.getNodeName();
+        if (nodeName.equals("param-value")) {
+          nbParamValue++;
+          String content = contextParam.getFirstChild().getTextContent();
+          assertThat(content).isIn(Arrays.asList("", "origin"));
+        }
+      } while ((contextParam = contextParam.getNextSibling()) != null);
+      assertThat(nbParamValue).isEqualTo(1);
+    }
+
+    List<String> patterns = testApp.getWebXml().getServletPatterns();
+    assertThat(patterns).contains("/test/*");
+    assertThat(patterns).doesNotContain("/_ah/queue/__deferred__");
+    assertThat(patterns).doesNotContain("/_ah/sessioncleanup");
+    assertThat(patterns).doesNotContain("/");
+    assertThat(patterns).doesNotContain("/*");
+  }
+
+  @Test
+  public void testStageGaeStandardJava8Servlet31QuickstartWithJSP()
+      throws IOException, ParserConfigurationException, SAXException {
+
+    Application testApp = Application.readApplication(SERVLET3_STANDARD_APP_ROOT);
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    assertThat(testApp.getAppId()).isEqualTo(SERVLET3_APP_ID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    // We want JSP compilation for Standard Java8.
+    opts.setCompileJsps(true);
+    File stageDir = testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
+
+    File quickstartXml = new File(stageDir, "WEB-INF/quickstart-web.xml");
+    File minQuickstartXml = new File(stageDir, "WEB-INF/min-quickstart-web.xml");
+
+    assertThat(quickstartXml.canRead()).isTrue();
+    assertThat(minQuickstartXml.canRead()).isTrue();
+
+    Document quickstartDoc =
+        DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(quickstartXml);
+    assertThat(
+            quickstartDoc.getDocumentElement().getElementsByTagName("filter-mapping").getLength())
+        .isEqualTo(0);
+    assertThat(
+            quickstartDoc.getDocumentElement().getElementsByTagName("servlet-mapping").getLength())
+        .isEqualTo(2);
+
+    Document minQuickstartDoc =
+        DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(minQuickstartXml);
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("filter-mapping")
+                .getLength())
+        .isEqualTo(0);
+    // 2 user defined servlets in the SERVLET3_APP_ID application, 1 by annotation and 1 by
+    // a pre-compiled JSP.
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("servlet-mapping")
+                .getLength())
+        .isEqualTo(2);
+
+    // We should not see any welcome-file entries:
+    assertThat(
+            minQuickstartDoc.getDocumentElement().getElementsByTagName("welcome-file").getLength())
+        .isEqualTo(0);
+    // We should not see any security-constraint entries:
+    assertThat(
+            minQuickstartDoc
+                .getDocumentElement()
+                .getElementsByTagName("security-constraint")
+                .getLength())
+        .isEqualTo(0);
+
+    // We want to verify that the list of tlds defined by:
+    // <context-param>
+    //   <param-name>org.eclipse.jetty.tlds</param-name>
+    //   <param-value><![CDATA[
+    //     "jar:file:/Users/ludo/.m2/repository/...,
+    //     "jar:${WAR}/WEB-INF/lib/jstl-1.2.jar!/META-INF/scriptfree.tld",
+    //       ...
+    // do not contain a local file reference, that would mean that the quickstart classpath
+    // contains tld jars, that should be on the user web app classpath.
+
+    NodeList nodeList = quickstartDoc.getElementsByTagName("context-param");
+    for (int i = 0; i < nodeList.getLength(); i++) {
+      Node contextParam = nodeList.item(i).getFirstChild();
+      do {
+        String nodeName = contextParam.getNodeName();
+        if (nodeName.equals("param-value")) {
+          String content = contextParam.getFirstChild().getTextContent();
+          assertThat(content).doesNotContain("\"jar:file");
+        }
+      } while ((contextParam = contextParam.getNextSibling()) != null);
+    }
+
+    List<String> patterns = testApp.getWebXml().getServletPatterns();
+    assertThat(patterns).contains("/test/*");
+    assertThat(patterns).contains("/index.jsp");
+    assertThat(patterns).doesNotContain("/_ah/queue/__deferred__");
+    assertThat(patterns).doesNotContain("/_ah/sessioncleanup");
+    assertThat(patterns).doesNotContain("/");
+    assertThat(patterns).doesNotContain("/*");
+  }
+
+  @Test
+  public void testStageGaeStandardJava8WithOnlyJasperContextInitializer()
+      throws IOException, ParserConfigurationException, SAXException {
+
+    Application testApp = Application.readApplication(SERVLET3_STANDARD_APP_ROOT);
+    testApp.setDetailsWriter(new PrintWriter(new OutputStreamWriter(System.out, UTF_8)));
+
+    assertThat(testApp.getAppId()).isEqualTo(SERVLET3_APP_ID);
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    // We want JSP compilation for Standard Java8.
+    opts.setCompileJsps(true);
+
+    testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
+    assertThat(testApp.getWebXml().getFallThroughToRuntime()).isFalse();
+    String expectedJasperInitializer =
+        "\"ContainerInitializer"
+            + "{org.eclipse.jetty.apache.jsp.JettyJasperInitializer"
+            + ",interested=[],applicable=[],annotated=[]}\"";
+    Map<String, String> trimmedContextParams =
+        Maps.transformValues(testApp.getWebXml().getContextParams(), String::trim);
+    assertThat(trimmedContextParams)
+        .containsEntry("org.eclipse.jetty.containerInitializers", expectedJasperInitializer);
+  }
+
+  //TODO(ludo) @Test
+  public void testStageGaeStandardJava8WithContextInitializers()
+      throws IOException, ParserConfigurationException, SAXException {
+    Application testApp = Application.readApplication(SERVLET3_STANDARD_APP_WITH_CONTAINER_INIT);
+    testApp.setDetailsWriter(new PrintWriter(new OutputStreamWriter(System.out, UTF_8)));
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+
+    // We want JSP compilation for Standard Java8.
+    opts.setCompileJsps(true);
+    testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
+    assertThat(testApp.getWebXml().getFallThroughToRuntime()).isTrue();
+    String expectedJasperInitializer =
+        "\"ContainerInitializer"
+            + "{servletthree.Servlet3ContainerInitializer"
+            + ",interested=[],applicable=[],annotated=[]}\"";
+    Map<String, String> trimmedContextParams =
+        Maps.transformValues(testApp.getWebXml().getContextParams(), String::trim);
+    assertThat(trimmedContextParams)
+        .containsEntry("org.eclipse.jetty.containerInitializers", expectedJasperInitializer);
+  }
+
+
+  @Test
+  public void testCountClasses() throws IOException {
+    assertThat(Application.countClasses(new File(CLASSES_TEST_FILES, "/WEB-INF/classes")))
+        .isEqualTo(1);
+  }
+
+  @Test
+  public void testCountClasses_noClassesDir() throws IOException {
+    // Test that we don't explode when WEB-INF/classes directory doesn't exist.
+    Application testApp = Application.readApplication(TEST_FILES);
+    testApp.createStagingDirectory(new ApplicationProcessingOptions());
+  }
+
+  @Test
+  public void testMimetypes() throws Exception {
+    assertThat(Application.guessContentTypeFromName("foo.class")).isEqualTo("application/java-vm");
+    assertThat(Application.guessContentTypeFromName("foo.css")).isEqualTo("text/css");
+    assertThat(Application.guessContentTypeFromName("foo.gif")).isEqualTo("image/gif");
+    assertThat(Application.guessContentTypeFromName("foo.ico")).isEqualTo("image/x-icon");
+    assertThat(Application.guessContentTypeFromName("foo.java")).isEqualTo("text/plain");
+    assertThat(Application.guessContentTypeFromName("foo.jar"))
+        .isEqualTo("application/java-archive");
+    assertThat(Application.guessContentTypeFromName("foo.jpe")).isEqualTo("image/jpeg");
+    assertThat(Application.guessContentTypeFromName("foo.jpeg")).isEqualTo("image/jpeg");
+    assertThat(Application.guessContentTypeFromName("foo.json")).isEqualTo("application/json");
+    assertThat(Application.guessContentTypeFromName("foo.htm")).isEqualTo("text/html");
+    assertThat(Application.guessContentTypeFromName("foo.html")).isEqualTo("text/html");
+    assertThat(Application.guessContentTypeFromName("foo.zip")).isEqualTo("application/zip");
+    assertThat(Application.guessContentTypeFromName("foo.ludo"))
+        .isEqualTo("application/octet-stream");
+    assertThat(Application.guessContentTypeFromName("foo.wasm")).isEqualTo("application/wasm");
+  }
+
+  @Test
+  public void testJava8NoWebXmlNoApiJar() throws Exception {
+
+    Path temp = CopyDirVisitor.createTempDirectoryFrom(Paths.get(JAVA8_NO_WEBXML));
+    Application testApp = Application.readApplication(temp.toFile().getAbsolutePath());
+    testApp.setDetailsWriter(
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
+
+    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
+    // No JSP compilation for this sample.
+    opts.setCompileJsps(false);
+    File stageDir = testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
+
+    File appYaml = new File(stageDir, "WEB-INF/appengine-generated/app.yaml");
+    assertFileContains(appYaml, "runtime: java8");
+    assertFileContains(appYaml, "threadsafe: True");
+    assertFileContains(appYaml, "api_version: 'user_defined'");
+  }
+
+  /** returns the Java version of the first class in the jar, or -1 if error. */
+  private static int getJavaJarVersion(File jarFile) throws Exception {
+    try (JarInputStream jarInputStream = new JarInputStream(new FileInputStream(jarFile))) {
+      JarEntry jarEntry = jarInputStream.getNextJarEntry();
+      while (jarEntry != null) {
+        if (jarEntry.getName().endsWith(".class")) {
+          // We only check the first class file in the jar.
+          DataInputStream in = new DataInputStream(jarInputStream);
+          if (in.readInt() == 0xcafebabe) {
+            in.readShort(); // discard minor version
+            int majorVersion = in.readShort();
+            int actualVersion = majorVersion - 44;
+            return actualVersion;
+          }
+          jarEntry = jarInputStream.getNextJarEntry();
+        }
+      }
+      return -1;
+    }
+  }
+
+  private static class CopyDirVisitor extends SimpleFileVisitor<Path> {
+
+    private final Path fromPath;
+    private final Path toPath;
+
+    CopyDirVisitor(Path fromPath, Path toPath) {
+      this.fromPath = fromPath;
+      this.toPath = toPath;
+    }
+    // Return a temp directory that contains the from directory
+    static Path createTempDirectoryFrom(Path from) throws IOException {
+      Path to = java.nio.file.Files.createTempDirectory("staging");
+      java.nio.file.Files.walkFileTree(
+          from,
+          EnumSet.of(FileVisitOption.FOLLOW_LINKS),
+          Integer.MAX_VALUE,
+          new CopyDirVisitor(from, to));
+      deleteOnExit(to.toFile());
+      return to;
+    }
+
+    private static void deleteOnExit(File folder) {
+      folder.deleteOnExit();
+      for (File file : folder.listFiles()) {
+        if (file.isDirectory()) {
+          deleteOnExit(file);
+        } else {
+          file.deleteOnExit();
+        }
+      }
+    }
+
+    @Override
+    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
+        throws IOException {
+      Path targetPath = toPath.resolve(fromPath.relativize(dir));
+      if (!java.nio.file.Files.exists(targetPath)) {
+        java.nio.file.Files.createDirectory(targetPath);
+      }
+      return FileVisitResult.CONTINUE;
+    }
+
+    @Override
+    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+      java.nio.file.Files.copy(
+          file, toPath.resolve(fromPath.relativize(file)), StandardCopyOption.REPLACE_EXISTING);
+      return FileVisitResult.CONTINUE;
+    }
+  }
+}
\ No newline at end of file
diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml
new file mode 100644
index 000000000..33038201e
--- /dev/null
+++ b/e2etests/testlocalapps/badcron/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>badcron</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: badcron</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..4474f35a8
--- /dev/null
+++ b/e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/cron.xml b/e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/cron.xml
new file mode 100644
index 000000000..431c840df
--- /dev/null
+++ b/e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/cron.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+cronentries>
+   <url>http://nowhere</url>
+   <timezone>GMQ</timezone>
+</cronentries>
diff --git a/e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..d3b5d4b3b
--- /dev/null
+++ b/e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml
new file mode 100644
index 000000000..b3e918607
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.google.appengine.demos</groupId>
+  <artifactId>bundle_standard</artifactId>
+  <version>0.0.2-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <name>AppEngine :: bundle_standard</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+  </properties>
+
+  <dependencies>
+    <!-- Include Servlet API -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>2.4.4</version>
+        <configuration>
+          <!-- can be set w/ -DprojectId=myProjectId on command line -->
+          <projectId>ludo-in-in</projectId>
+          <!--promote>false</promote-->
+          <version>demo</version>
+          <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.3.1</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard/src/main/java/servletthree/Servlet3Test.java b/e2etests/testlocalapps/bundle_standard/src/main/java/servletthree/Servlet3Test.java
new file mode 100644
index 000000000..e7a8fb82e
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard/src/main/java/servletthree/Servlet3Test.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package servletthree;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ */
+@WebServlet(
+    name = "servlet3test",
+    urlPatterns = {"/test/*"},
+    initParams = {
+      @WebInitParam(name = "prefix", value = "<<<"),
+      @WebInitParam(name = "suffix", value = ">>>")
+    })
+public class Servlet3Test extends HttpServlet {
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    resp.setContentType("text/plain");
+    resp.setStatus(200);
+    try (PrintWriter writer =
+        new PrintWriter(
+            new BufferedWriter(new OutputStreamWriter(resp.getOutputStream(), UTF_8)))) {
+      String prefix = getInitParameter("prefix");
+      String suffix = getInitParameter("suffix");
+      writer.println(prefix + req.getRequestURI() + suffix);
+      // Check we are not running with a security manager:
+      SecurityManager security = System.getSecurityManager();
+      if (security != null) {
+        throw new RuntimeException("Security manager detected.");
+      }
+    }
+  }
+}
diff --git a/e2etests/testlocalapps/bundle_standard/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/bundle_standard/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..a0244565b
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>servlet3-demo</application>
+  <version>1</version>
+  <threadsafe>true</threadsafe>
+  <sessions-enabled>true</sessions-enabled>
+  <runtime>java8</runtime>
+</appengine-web-app>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/bundle_standard/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..d30021931
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd">
+  <display-name>Servlet3 Test</display-name>
+
+</web-app>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard/src/main/webapp/index.jsp b/e2etests/testlocalapps/bundle_standard/src/main/webapp/index.jsp
new file mode 100644
index 000000000..740dee8f7
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard/src/main/webapp/index.jsp
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+  <%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>JSP Page</title>
+  </head>
+  <body>
+    <h1>Hello World!</h1>
+  </body>
+</html>
diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
new file mode 100644
index 000000000..1f182bb4f
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.google.appengine.demos</groupId>
+  <artifactId>bundle_standard_with_container_initializer</artifactId>
+  <version>0.0.2-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <name>AppEngine :: bundle_standard_with_container_initializer</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+  </properties>
+
+  <dependencies>
+    <!-- Include Servlet API -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.auto.value</groupId>
+      <artifactId>auto-value</artifactId>
+      <version>1.10.2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.auto.service</groupId>
+      <artifactId>auto-service-annotations</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>2.4.4</version>
+        <configuration>
+          <!-- can be set w/ -DprojectId=myProjectId on command line -->
+          <projectId>ludo-in-in</projectId>
+          <!--promote>false</promote-->
+          <version>demo</version>
+          <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.3.1</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/java/servletthree/Servlet3ContainerInitializer.java b/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/java/servletthree/Servlet3ContainerInitializer.java
new file mode 100644
index 000000000..46ace6fc8
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/java/servletthree/Servlet3ContainerInitializer.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package servletthree;
+
+import com.google.auto.service.AutoService;
+import java.util.Set;
+import javax.servlet.ServletContainerInitializer;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+/** Simple ServletContainerInitializer */
+@AutoService(ServletContainerInitializer.class)
+public class Servlet3ContainerInitializer implements ServletContainerInitializer {
+
+  @Override
+  public void onStartup(Set<Class<?>> set, ServletContext servletContext) throws ServletException {
+    System.out.println("test");
+  }
+}
diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..a0244565b
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>servlet3-demo</application>
+  <version>1</version>
+  <threadsafe>true</threadsafe>
+  <sessions-enabled>true</sessions-enabled>
+  <runtime>java8</runtime>
+</appengine-web-app>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..d30021931
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd">
+  <display-name>Servlet3 Test</display-name>
+
+</web-app>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/index.jsp b/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/index.jsp
new file mode 100644
index 000000000..740dee8f7
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/index.jsp
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+  <%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>JSP Page</title>
+  </head>
+  <body>
+    <h1>Hello World!</h1>
+  </body>
+</html>
diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
new file mode 100644
index 000000000..13aec81de
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.google.appengine.demos</groupId>
+  <artifactId>bundle_standard_with_no_jsp</artifactId>
+  <version>0.0.2-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <name>AppEngine :: bundle_standard_with_no_jsp</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <spring.boot.version>2.7.2</spring.boot.version>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+  </properties>
+
+  <dependencies>
+    <!-- Include Servlet API -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>2.4.4</version>
+        <configuration>
+          <!-- can be set w/ -DprojectId=myProjectId on command line -->
+          <projectId>ludo-in-in</projectId>
+          <!--promote>false</promote-->
+          <version>demo</version>
+          <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.3.1</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/java/servletthree/Servlet3Test.java b/e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/java/servletthree/Servlet3Test.java
new file mode 100644
index 000000000..e7a8fb82e
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/java/servletthree/Servlet3Test.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package servletthree;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ */
+@WebServlet(
+    name = "servlet3test",
+    urlPatterns = {"/test/*"},
+    initParams = {
+      @WebInitParam(name = "prefix", value = "<<<"),
+      @WebInitParam(name = "suffix", value = ">>>")
+    })
+public class Servlet3Test extends HttpServlet {
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    resp.setContentType("text/plain");
+    resp.setStatus(200);
+    try (PrintWriter writer =
+        new PrintWriter(
+            new BufferedWriter(new OutputStreamWriter(resp.getOutputStream(), UTF_8)))) {
+      String prefix = getInitParameter("prefix");
+      String suffix = getInitParameter("suffix");
+      writer.println(prefix + req.getRequestURI() + suffix);
+      // Check we are not running with a security manager:
+      SecurityManager security = System.getSecurityManager();
+      if (security != null) {
+        throw new RuntimeException("Security manager detected.");
+      }
+    }
+  }
+}
diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..3d7088694
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>servlet3-demo</application>
+  <version>1</version>
+  <threadsafe>true</threadsafe>
+  <sessions-enabled>true</sessions-enabled>
+  <runtime>java8</runtime>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..d30021931
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd">
+  <display-name>Servlet3 Test</display-name>
+
+</web-app>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
new file mode 100644
index 000000000..c12db4018
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.google.appengine.demos</groupId>
+  <artifactId>bundle_standard_with_weblistener_memcache</artifactId>
+  <version>0.0.2-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <name>AppEngine :: bundle_standard_with_weblistener_memcache</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <spring.boot.version>2.7.2</spring.boot.version>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+  </properties>
+
+  <dependencies>
+    <!-- Include Servlet API -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+      <version>2.0.17</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>2.4.4</version>
+        <configuration>
+          <!-- can be set w/ -DprojectId=myProjectId on command line -->
+          <projectId>ludo-in-in</projectId>
+          <!--promote>false</promote-->
+          <version>demo</version>
+          <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.3.1</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/java/servletthree/WebListenerWithMemcache.java b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/java/servletthree/WebListenerWithMemcache.java
new file mode 100644
index 000000000..70db2c0e8
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/java/servletthree/WebListenerWithMemcache.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package servletthree;
+
+import com.google.appengine.api.memcache.BaseMemcacheService;
+import com.google.appengine.api.memcache.ErrorHandler;
+import com.google.appengine.api.memcache.InvalidValueException;
+import com.google.appengine.api.memcache.MemcacheServiceException;
+import com.google.appengine.api.memcache.MemcacheServiceFactory;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+/** Simple WebListener that depends on some GAE API (memcache) to reproduce b/120480580. */
+@WebListener
+public class WebListenerWithMemcache implements ServletContextListener {
+  @Override
+  public void contextInitialized(ServletContextEvent servletContextEvent) {
+    BaseMemcacheService bms = MemcacheServiceFactory.getMemcacheService();
+    bms.setErrorHandler(
+        new ErrorHandler() {
+          @Override
+          public void handleDeserializationError(InvalidValueException e) {}
+
+          @Override
+          public void handleServiceError(MemcacheServiceException e) {}
+        });
+  }
+
+  @Override
+  public void contextDestroyed(ServletContextEvent servletContextEvent) {}
+}
diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..a0244565b
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>servlet3-demo</application>
+  <version>1</version>
+  <threadsafe>true</threadsafe>
+  <sessions-enabled>true</sessions-enabled>
+  <runtime>java8</runtime>
+</appengine-web-app>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..d30021931
--- /dev/null
+++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd">
+  <display-name>Servlet3 Test</display-name>
+
+</web-app>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
new file mode 100644
index 000000000..48cd15119
--- /dev/null
+++ b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>cron-bad-job-age-limit</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: cron-bad-job-age-limit</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..f0576a126
--- /dev/null
+++ b/e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/cron.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/cron.xml
new file mode 100644
index 000000000..6d6e6ebbd
--- /dev/null
+++ b/e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/cron.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cronentries>
+
+  <cron>
+   <url>/nowhere_1</url>
+   <schedule>every 5 hours</schedule>
+   <retry-parameters>
+     <job-retry-limit>3</job-retry-limit>
+     <job-age-limit>2x</job-age-limit>
+     <min-backoff-seconds>2.4</min-backoff-seconds>
+     <max-backoff-seconds>10.5</max-backoff-seconds>
+     <max-doublings>4</max-doublings>
+   </retry-parameters>
+   <timezone>GMT</timezone>
+   <description>all retry parameters</description>
+  </cron>
+
+</cronentries>
diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..917096f25
--- /dev/null
+++ b/e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml
new file mode 100644
index 000000000..13977cfb4
--- /dev/null
+++ b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>cron-good-retry-parameters</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: cron-good-retry-parameters</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..f0576a126
--- /dev/null
+++ b/e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/cron.xml b/e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/cron.xml
new file mode 100644
index 000000000..8622d38c5
--- /dev/null
+++ b/e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/cron.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cronentries>
+
+  <cron>
+   <url>/nowhere_1</url>
+   <schedule>every 5 hours</schedule>
+   <retry-parameters>
+     <job-retry-limit>3</job-retry-limit>
+     <job-age-limit>2d</job-age-limit>
+     <min-backoff-seconds>2.4</min-backoff-seconds>
+     <max-backoff-seconds>10.5</max-backoff-seconds>
+     <max-doublings>4</max-doublings>
+   </retry-parameters>
+   <timezone>GMT</timezone>
+   <description>all retry parameters</description>
+  </cron>
+
+  <cron>
+   <url>/nowhere_2</url>
+   <schedule>every 6 hours</schedule>
+   <retry-parameters>
+     <job-retry-limit>2</job-retry-limit>
+   </retry-parameters>
+   <timezone>GMT</timezone>
+   <description>one retry parameter</description>
+  </cron>
+
+  <cron>
+   <url>/nowhere_3</url>
+   <schedule>every 7 hours</schedule>
+   <retry-parameters>
+   </retry-parameters>
+   <timezone>GMT</timezone>
+   <description>empty retry parameters</description>
+  </cron>
+
+  <cron>
+   <url>/nowhere_4</url>
+   <schedule>every 8 hours</schedule>
+   <timezone>GMT</timezone>
+   <description>no retry parameters</description>
+  </cron>
+
+</cronentries>
diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..917096f25
--- /dev/null
+++ b/e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml
new file mode 100644
index 000000000..24430eaeb
--- /dev/null
+++ b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>cron-negative-max-backoff</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: cron-negative-max-backoff</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/cron-negative-max-backoff/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..f0576a126
--- /dev/null
+++ b/e2etests/testlocalapps/cron-negative-max-backoff/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/src/main/webapp/WEB-INF/cron.xml b/e2etests/testlocalapps/cron-negative-max-backoff/src/main/webapp/WEB-INF/cron.xml
new file mode 100644
index 000000000..8e2419659
--- /dev/null
+++ b/e2etests/testlocalapps/cron-negative-max-backoff/src/main/webapp/WEB-INF/cron.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cronentries>
+
+  <cron>
+   <url>/nowhere_1</url>
+   <schedule>every 5 hours</schedule>
+   <retry-parameters>
+     <job-retry-limit>3</job-retry-limit>
+     <job-age-limit>2d</job-age-limit>
+     <min-backoff-seconds>2.4</min-backoff-seconds>
+     <max-backoff-seconds>-10.5</max-backoff-seconds>
+     <max-doublings>4</max-doublings>
+   </retry-parameters>
+   <timezone>GMT</timezone>
+   <description>all retry parameters</description>
+  </cron>
+
+</cronentries>
diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/cron-negative-max-backoff/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..917096f25
--- /dev/null
+++ b/e2etests/testlocalapps/cron-negative-max-backoff/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml
new file mode 100644
index 000000000..6757ac160
--- /dev/null
+++ b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>cron-negative-retry-limit</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: cron-negative-retry-limit</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/cron-negative-retry-limit/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..f0576a126
--- /dev/null
+++ b/e2etests/testlocalapps/cron-negative-retry-limit/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/src/main/webapp/WEB-INF/cron.xml b/e2etests/testlocalapps/cron-negative-retry-limit/src/main/webapp/WEB-INF/cron.xml
new file mode 100644
index 000000000..2e9931a9b
--- /dev/null
+++ b/e2etests/testlocalapps/cron-negative-retry-limit/src/main/webapp/WEB-INF/cron.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cronentries>
+
+  <cron>
+   <url>/nowhere_1</url>
+   <schedule>every 5 hours</schedule>
+   <retry-parameters>
+     <job-retry-limit>-3</job-retry-limit>
+     <job-age-limit>2d</job-age-limit>
+     <min-backoff-seconds>2.4</min-backoff-seconds>
+     <max-backoff-seconds>10.5</max-backoff-seconds>
+     <max-doublings>4</max-doublings>
+   </retry-parameters>
+   <timezone>GMT</timezone>
+   <description>all retry parameters</description>
+  </cron>
+
+</cronentries>
diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/cron-negative-retry-limit/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..917096f25
--- /dev/null
+++ b/e2etests/testlocalapps/cron-negative-retry-limit/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml
new file mode 100644
index 000000000..82999ef1d
--- /dev/null
+++ b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>cron-two-max-doublings</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: cron-two-max-doublings</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-two-max-doublings/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/cron-two-max-doublings/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..f0576a126
--- /dev/null
+++ b/e2etests/testlocalapps/cron-two-max-doublings/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/cron-two-max-doublings/src/main/webapp/WEB-INF/cron.xml b/e2etests/testlocalapps/cron-two-max-doublings/src/main/webapp/WEB-INF/cron.xml
new file mode 100644
index 000000000..1dc30acea
--- /dev/null
+++ b/e2etests/testlocalapps/cron-two-max-doublings/src/main/webapp/WEB-INF/cron.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cronentries>
+
+  <cron>
+   <url>/nowhere_1</url>
+   <schedule>every 5 hours</schedule>
+   <retry-parameters>
+     <job-retry-limit>3</job-retry-limit>
+     <job-age-limit>2d</job-age-limit>
+     <min-backoff-seconds>2.4</min-backoff-seconds>
+     <max-backoff-seconds>10.5</max-backoff-seconds>
+     <max-doublings>4</max-doublings>
+     <max-doublings>3</max-doublings>
+   </retry-parameters>
+   <timezone>GMT</timezone>
+   <description>all retry parameters</description>
+  </cron>
+
+</cronentries>
diff --git a/e2etests/testlocalapps/cron-two-max-doublings/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/cron-two-max-doublings/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..917096f25
--- /dev/null
+++ b/e2etests/testlocalapps/cron-two-max-doublings/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml
new file mode 100644
index 000000000..7fb86db76
--- /dev/null
+++ b/e2etests/testlocalapps/http-headers/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>http-headers</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: http-headers</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/http-headers/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/http-headers/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..8b1a665c6
--- /dev/null
+++ b/e2etests/testlocalapps/http-headers/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <static-files>
+    <include path="/my-static-files">
+      <http-header name="P3P" value="P3P header value"/>
+      <http-header name="Access-Control-Allow-Origin" value="http://example.org"/>
+    </include>
+  </static-files>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/http-headers/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/http-headers/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/http-headers/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml
new file mode 100644
index 000000000..9889c0820
--- /dev/null
+++ b/e2etests/testlocalapps/java8-jar/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>java8-jar</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: java8-jar</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/java8-jar/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/java8-jar/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..9b3be4c69
--- /dev/null
+++ b/e2etests/testlocalapps/java8-jar/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/java8-jar/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/java8-jar/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a3f85d4f0
--- /dev/null
+++ b/e2etests/testlocalapps/java8-jar/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+  <!-- We are never supposed to get as far as using this so it is empty. -->
+</web-app>
diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml
new file mode 100644
index 000000000..3a27f2ee2
--- /dev/null
+++ b/e2etests/testlocalapps/java8-no-webxml/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>java8-no-webxml</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: java8-no-webxml</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/java8-no-webxml/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/java8-no-webxml/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..a3aa6e449
--- /dev/null
+++ b/e2etests/testlocalapps/java8-no-webxml/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <runtime>java8</runtime>
+  <threadsafe>true</threadsafe>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/java8-static b/e2etests/testlocalapps/java8-static
new file mode 100644
index 000000000..52a278aa7
--- /dev/null
+++ b/e2etests/testlocalapps/java8-static
@@ -0,0 +1,7 @@
+<html>
+<head>
+<title>Nonsense</title>
+</head><body>
+This is just a test file.
+</body>
+</html>
diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml
new file mode 100644
index 000000000..1272d7045
--- /dev/null
+++ b/e2etests/testlocalapps/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>testlocalapss</artifactId>
+  <name>AppEngine :: Test local applications</name>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>e2etests</artifactId>
+    <version>2.0.20-SNAPSHOT</version>
+  </parent>
+  <packaging>pom</packaging>
+  <properties>
+       <maven.deploy.skip>true</maven.deploy.skip>
+  </properties>
+  <modules>
+      <module>badcron</module>
+      <module>cron-bad-job-age-limit</module>
+      <module>cron-good-retry-parameters</module>
+      <module>cron-negative-max-backoff</module>
+      <module>cron-negative-retry-limit</module>
+      <module>cron-two-max-doublings</module>
+      <module>http-headers</module>
+      <module>java8-jar</module>
+      <module>java8-no-webxml</module>
+      <module>sampleapp</module>
+      <module>sampleapp-automatic-module</module>
+      <module>sampleapp-backends</module>
+      <module>sampleapp-basic-module</module>
+      <module>sampleapp-manual-module</module>
+      <module>sampleapp-runtime</module>
+      <module>sample-badaeweb</module>
+      <module>sample-badentrypoint</module>
+      <module>sample-badindexes</module>
+      <module>sample-badruntimechannel</module>
+      <module>sample-badweb</module>
+      <module>sample-baddispatch</module>
+      <module>sample-baddispatch-yaml</module>
+      <module>sample-default-auto-ids</module>
+      <module>sample-error-in-tag-file</module>
+      <module>sample-java11</module>
+      <module>sample-java17</module>
+      <module>sample-jsptaglibrary</module>
+      <module>sample-jspx</module>
+      <module>sample-legacy-auto-ids</module>
+      <module>sample-missingappid</module>
+      <module>sample-nojsps</module>
+      <module>sample-unspecified-auto-ids</module>
+      <module>sample-with-classes</module>
+      <module>stage-sampleapp</module>
+      <module>stage-with-staging-options</module>
+      <module>xmlorder</module>
+      <module>bundle_standard</module>
+      <module>bundle_standard_with_container_initializer</module>
+      <module>bundle_standard_with_no_jsp</module>
+      <module>bundle_standard_with_weblistener_memcache</module>
+  </modules>
+</project>
diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml
new file mode 100644
index 000000000..e73fd55e4
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badaeweb/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-badaeweb</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-badaeweb</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-badaeweb/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-badaeweb/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..67b21e208
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badaeweb/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files>
+    <include path="*.html" expiration="not valid"/>
+  </static-files>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-badaeweb/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-badaeweb/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..917096f25
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badaeweb/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml
new file mode 100644
index 000000000..945c6b8b2
--- /dev/null
+++ b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-baddispatch-yaml</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-baddispatch-yaml</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..1a5660871
--- /dev/null
+++ b/e2etests/testlocalapps/sample-baddispatch-yaml/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/src/main/webapp/WEB-INF/dispatch.yaml b/e2etests/testlocalapps/sample-baddispatch-yaml/src/main/webapp/WEB-INF/dispatch.yaml
new file mode 100644
index 000000000..eec9d0100
--- /dev/null
+++ b/e2etests/testlocalapps/sample-baddispatch-yaml/src/main/webapp/WEB-INF/dispatch.yaml
@@ -0,0 +1,18 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+dispatch:
+  - not-url: a.b.com/c
+    service: web
+
diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..d3b5d4b3b
--- /dev/null
+++ b/e2etests/testlocalapps/sample-baddispatch-yaml/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml
new file mode 100644
index 000000000..9e15fe380
--- /dev/null
+++ b/e2etests/testlocalapps/sample-baddispatch/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-baddispatch</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-baddispatch</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-baddispatch/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-baddispatch/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..1a5660871
--- /dev/null
+++ b/e2etests/testlocalapps/sample-baddispatch/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-baddispatch/src/main/webapp/WEB-INF/dispatch.xml b/e2etests/testlocalapps/sample-baddispatch/src/main/webapp/WEB-INF/dispatch.xml
new file mode 100644
index 000000000..e598679cf
--- /dev/null
+++ b/e2etests/testlocalapps/sample-baddispatch/src/main/webapp/WEB-INF/dispatch.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+ <dispatch-entries>
+    <dispatch>
+      <not-url>*/userapp/*</not-url>
+      <module>web</module>
+  </dispatch>
+</dispatch-entries>
diff --git a/e2etests/testlocalapps/sample-baddispatch/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-baddispatch/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..d3b5d4b3b
--- /dev/null
+++ b/e2etests/testlocalapps/sample-baddispatch/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-badentrypoint/pom.xml b/e2etests/testlocalapps/sample-badentrypoint/pom.xml
new file mode 100644
index 000000000..816462415
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badentrypoint/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-badentrypoint</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-badentrypoint</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-badentrypoint/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-badentrypoint/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..9e457edba
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badentrypoint/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <threadsafe>true</threadsafe>
+  <runtime>java8</runtime>
+  <entrypoint>java -jar foo.jar</entrypoint>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-badentrypoint/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-badentrypoint/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..974d1619f
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badentrypoint/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml
new file mode 100644
index 000000000..7e2ba05ac
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badindexes/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-badindexes</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-badindexes</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-badindexes/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-badindexes/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..c8005e891
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badindexes/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-badindexes/src/main/webapp/WEB-INF/datastore-indexes.xml b/e2etests/testlocalapps/sample-badindexes/src/main/webapp/WEB-INF/datastore-indexes.xml
new file mode 100644
index 000000000..f5a364cf4
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badindexes/src/main/webapp/WEB-INF/datastore-indexes.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<datastore-indexes autoGenerate="badvalue">
+</datastore-indexes>
diff --git a/e2etests/testlocalapps/sample-badindexes/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-badindexes/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..917096f25
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badindexes/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml
new file mode 100644
index 000000000..237bf284f
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-badruntimechannel</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-badruntimechannel</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <spring.boot.version>2.7.2</spring.boot.version>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-badruntimechannel/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-badruntimechannel/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..b33f19cb1
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badruntimechannel/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <threadsafe>true</threadsafe>
+  <runtime>java8</runtime>
+  <runtime-channel>canary</runtime-channel>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-badruntimechannel/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-badruntimechannel/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..974d1619f
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badruntimechannel/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml
new file mode 100644
index 000000000..e62bc92a0
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badweb/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-badweb</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-badweb</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-badweb/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-badweb/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..c8005e891
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badweb/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-badweb/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-badweb/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..8b58c09d6
--- /dev/null
+++ b/e2etests/testlocalapps/sample-badweb/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>/invalid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml
new file mode 100644
index 000000000..2aab7c5cd
--- /dev/null
+++ b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-default-auto-ids</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-default-auto-ids</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-default-auto-ids/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-default-auto-ids/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..bd9c963ac
--- /dev/null
+++ b/e2etests/testlocalapps/sample-default-auto-ids/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+  <auto-id-policy>default</auto-id-policy>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-default-auto-ids/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-default-auto-ids/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sample-default-auto-ids/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-default-auto-ids/src/main/webapp/random.html b/e2etests/testlocalapps/sample-default-auto-ids/src/main/webapp/random.html
new file mode 100644
index 000000000..259193564
--- /dev/null
+++ b/e2etests/testlocalapps/sample-default-auto-ids/src/main/webapp/random.html
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+<title>Nonsense</title>
+</head><body>
+This is just a test file.
+</body>
+</html>
diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml
new file mode 100644
index 000000000..c6982601d
--- /dev/null
+++ b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-error-in-tag-file</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-error-in-tag-file</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..7612ffc8d
--- /dev/null
+++ b/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <threadsafe>true</threadsafe>
+  <runtime>java8</runtime>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/nested/message.jsp b/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/nested/message.jsp
new file mode 100644
index 000000000..9b4a070ab
--- /dev/null
+++ b/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/nested/message.jsp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<%@ page contentType="text/html" pageEncoding="UTF-8" %>
+<%@ taglib prefix="ui" tagdir="/WEB-INF/tags/ui" %>
+
+
+<ui:page title="a title">
+
+</ui:page>
diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/tags/ui/page.tag b/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/tags/ui/page.tag
new file mode 100644
index 000000000..cd07ebf8c
--- /dev/null
+++ b/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/tags/ui/page.tag
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<%@ tag description="App Engine Tag Testing" pageEncoding="UTF-8" %>
+<%@ attribute name="title" required="true" %>
+<jsp:useBean id="message" scope="request" class="com.google.doesnotexist.shouldget.compilerror" />
+<div id="messages">
+    <p>App Engine rocks: ${title}</p>
+ </div>
+<jsp:doBody />
+
diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..90e90bf12
--- /dev/null
+++ b/e2etests/testlocalapps/sample-error-in-tag-file/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+</web-app>
diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml
new file mode 100644
index 000000000..9bb21db6c
--- /dev/null
+++ b/e2etests/testlocalapps/sample-java11/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-java11</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-java11</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-java11/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-java11/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..cd9b60e0b
--- /dev/null
+++ b/e2etests/testlocalapps/sample-java11/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <threadsafe>true</threadsafe>
+  <runtime>java11</runtime>
+  <runtime-channel>canary</runtime-channel>
+  <entrypoint>java -jar foo.jar</entrypoint>
+  <app-engine-apis>true</app-engine-apis>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-java11/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-java11/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..974d1619f
--- /dev/null
+++ b/e2etests/testlocalapps/sample-java11/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml
new file mode 100644
index 000000000..c0355b3bf
--- /dev/null
+++ b/e2etests/testlocalapps/sample-java17/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-java17</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-java17</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-java17/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-java17/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..a6e4f36ae
--- /dev/null
+++ b/e2etests/testlocalapps/sample-java17/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <threadsafe>true</threadsafe>
+  <runtime>java17</runtime>
+  <runtime-channel>canary</runtime-channel>
+  <entrypoint>java -jar foo.jar</entrypoint>
+  <app-engine-apis>true</app-engine-apis>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-java17/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-java17/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..974d1619f
--- /dev/null
+++ b/e2etests/testlocalapps/sample-java17/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml
new file mode 100644
index 000000000..3c22d9c9c
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-jsptaglibrary</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-jsptaglibrary</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..7612ffc8d
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <threadsafe>true</threadsafe>
+  <runtime>java8</runtime>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/WEB-INF/tags/ui/page.tag b/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/WEB-INF/tags/ui/page.tag
new file mode 100644
index 000000000..a75565901
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/WEB-INF/tags/ui/page.tag
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<%@ tag description="App Engine Tag Testing" pageEncoding="UTF-8" %>
+<%@ attribute name="title" required="true" %>
+
+<div id="messages">
+    <p>App Engine rocks: ${title}</p>
+ </div>
+
+<jsp:doBody />
+
diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..6762f0f23
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+                             http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/nested/message.jsp b/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/nested/message.jsp
new file mode 100644
index 000000000..b0076b353
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jsptaglibrary/src/main/webapp/nested/message.jsp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<%@ page contentType="text/html" pageEncoding="UTF-8" %>
+<%@ taglib prefix="ui" tagdir="/WEB-INF/tags/ui" %>
+
+
+<ui:page title="a title">
+
+</ui:page>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml
new file mode 100644
index 000000000..9bdf2062f
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jspx/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-jspx</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-jspx</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-jspx/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-jspx/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..c8005e891
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jspx/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-jspx/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-jspx/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jspx/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-jspx/src/main/webapp/nested/dukebanner.html b/e2etests/testlocalapps/sample-jspx/src/main/webapp/nested/dukebanner.html
new file mode 100644
index 000000000..154c4464e
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jspx/src/main/webapp/nested/dukebanner.html
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<table border="0" width="400" cellspacing="0" 
+              cellpadding="0">
+
+<tr>
+<td height="150" width="150"> &nbsp; </td>
+<td width="250"> &nbsp; </td>
+</tr>
+
+<tr>
+<td width="150"> &nbsp; </td>
+<td align="right" width="250"> 
+I'm lazy, this should be an image.
+</tr>
+
+</table>
+<br>
diff --git a/e2etests/testlocalapps/sample-jspx/src/main/webapp/nested/testing.jspx b/e2etests/testlocalapps/sample-jspx/src/main/webapp/nested/testing.jspx
new file mode 100644
index 000000000..0d4317f07
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jspx/src/main/webapp/nested/testing.jspx
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page">
+
+<jsp:directive.page info="a hello world example"/>
+
+<html>
+<head><title>Hello, World</title></head>
+<body bgcolor="#ffffff" background="background.gif">
+
+<jsp:directive.include file="dukebanner.html"/>
+
+<table>
+<tr>
+<td width="150"> &amp;nbsp; </td>
+<td width="250" align="right"> <h1>Hello, World!</h1>
+It is now <jsp:expression>System.currentTimeMillis()</jsp:expression>
+milliseconds past the epoch. </td>
+</tr>
+</table>
+
+</body>
+</html>
+
+</jsp:root>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-jspx/src/main/webapp/random.html b/e2etests/testlocalapps/sample-jspx/src/main/webapp/random.html
new file mode 100644
index 000000000..259193564
--- /dev/null
+++ b/e2etests/testlocalapps/sample-jspx/src/main/webapp/random.html
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+<title>Nonsense</title>
+</head><body>
+This is just a test file.
+</body>
+</html>
diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml
new file mode 100644
index 000000000..86d2ca6ec
--- /dev/null
+++ b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-legacy-auto-ids</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-legacy-auto-ids</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..5bbb61e1e
--- /dev/null
+++ b/e2etests/testlocalapps/sample-legacy-auto-ids/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+  <auto-id-policy>legacy</auto-id-policy>
+  <runtime>java8</runtime>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sample-legacy-auto-ids/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/src/main/webapp/random.html b/e2etests/testlocalapps/sample-legacy-auto-ids/src/main/webapp/random.html
new file mode 100644
index 000000000..259193564
--- /dev/null
+++ b/e2etests/testlocalapps/sample-legacy-auto-ids/src/main/webapp/random.html
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+<title>Nonsense</title>
+</head><body>
+This is just a test file.
+</body>
+</html>
diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml
new file mode 100644
index 000000000..99273bc27
--- /dev/null
+++ b/e2etests/testlocalapps/sample-missingappid/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-missingappid</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-missingappid</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <spring.boot.version>2.7.2</spring.boot.version>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-missingappid/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-missingappid/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..bce905528
--- /dev/null
+++ b/e2etests/testlocalapps/sample-missingappid/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+
+  <!-- application tag deliberately omitted -->
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+  <runtime>java8</runtime>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-missingappid/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-missingappid/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sample-missingappid/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml
new file mode 100644
index 000000000..4db77be8b
--- /dev/null
+++ b/e2etests/testlocalapps/sample-nojsps/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-nojsps</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-nojsps</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..c8005e891
--- /dev/null
+++ b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/cron.xml b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/cron.xml
new file mode 100644
index 000000000..8af78157b
--- /dev/null
+++ b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/cron.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cronentries/>
diff --git a/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/dukebanner.html b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/dukebanner.html
new file mode 100644
index 000000000..c0758a5bb
--- /dev/null
+++ b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/dukebanner.html
@@ -0,0 +1,32 @@
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<table border="0" width="400" cellspacing="0" 
+              cellpadding="0">
+
+<tr>
+<td height="150" width="150"> &nbsp; </td>
+<td width="250"> &nbsp; </td>
+</tr>
+
+<tr>
+<td width="150"> &nbsp; </td>
+<td align="right" width="250"> 
+I'm lazy, this should be an image.
+</tr>
+
+</table>
+<br>
diff --git a/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..917096f25
--- /dev/null
+++ b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-nojsps/src/main/webapp/random.html b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/random.html
new file mode 100644
index 000000000..259193564
--- /dev/null
+++ b/e2etests/testlocalapps/sample-nojsps/src/main/webapp/random.html
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+<title>Nonsense</title>
+</head><body>
+This is just a test file.
+</body>
+</html>
diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml
new file mode 100644
index 000000000..cf21905c5
--- /dev/null
+++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-unspecified-auto-ids</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-unspecified-auto-ids</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <spring.boot.version>2.7.2</spring.boot.version>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..f0576a126
--- /dev/null
+++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/src/main/webapp/random.html b/e2etests/testlocalapps/sample-unspecified-auto-ids/src/main/webapp/random.html
new file mode 100644
index 000000000..259193564
--- /dev/null
+++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/src/main/webapp/random.html
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+<title>Nonsense</title>
+</head><body>
+This is just a test file.
+</body>
+</html>
diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml
new file mode 100644
index 000000000..862e89f34
--- /dev/null
+++ b/e2etests/testlocalapps/sample-with-classes/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sample-with-classes</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sample-with-classes</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-with-classes/src/main/java/foo/AClass.java b/e2etests/testlocalapps/sample-with-classes/src/main/java/foo/AClass.java
new file mode 100644
index 000000000..ca9a9fa6f
--- /dev/null
+++ b/e2etests/testlocalapps/sample-with-classes/src/main/java/foo/AClass.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package foo;
+
+/**
+ *
+ */
+final class AClass {
+
+  private AClass() {
+  }
+}
diff --git a/e2etests/testlocalapps/sample-with-classes/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sample-with-classes/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..f0576a126
--- /dev/null
+++ b/e2etests/testlocalapps/sample-with-classes/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sample-with-classes/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sample-with-classes/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sample-with-classes/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml
new file mode 100644
index 000000000..d10f1ced0
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sampleapp-automatic-module</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sampleapp-automatic-module</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sampleapp-automatic-module/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..1dba29c62
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-automatic-module/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <module>stan</module>
+  <runtime>java8</runtime>
+  <instance-class>F8</instance-class>
+  <automatic-scaling>
+    <min-pending-latency>10.5s</min-pending-latency>
+    <max-pending-latency>10900ms</max-pending-latency>
+    <min-idle-instances>automatic</min-idle-instances>
+    <max-idle-instances>10</max-idle-instances>
+    <max-concurrent-requests>20</max-concurrent-requests>
+  </automatic-scaling>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sampleapp-automatic-module/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-automatic-module/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml
new file mode 100644
index 000000000..55e718e66
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-backends/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sampleapp-backends</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sampleapp-backends</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-backends/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sampleapp-backends/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..c8005e891
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-backends/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sampleapp-backends/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sampleapp-backends/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-backends/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml
new file mode 100644
index 000000000..21512eff8
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sampleapp-basic-module</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sampleapp-basic-module</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-basic-module/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sampleapp-basic-module/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..83e5ded73
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-basic-module/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+  <module>stan</module>
+  <instance-class>B8</instance-class>
+  <basic-scaling>
+    <max-instances>11</max-instances>
+    <idle-timeout>10m</idle-timeout>
+  </basic-scaling>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sampleapp-basic-module/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sampleapp-basic-module/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-basic-module/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml
new file mode 100644
index 000000000..7a6f36a84
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sampleapp-manual-module</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sampleapp-manual-module</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-manual-module/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sampleapp-manual-module/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..64906d057
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-manual-module/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <module>stan</module>
+  <instance-class>B8</instance-class>
+  <runtime>java8</runtime>
+  <manual-scaling>
+    <instances>10</instances>
+  </manual-scaling>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sampleapp-manual-module/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sampleapp-manual-module/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-manual-module/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml
new file mode 100644
index 000000000..70974bba4
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-runtime/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sampleapp-runtime</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sampleapp-runtime</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-runtime/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sampleapp-runtime/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..b25e28c14
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-runtime/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>foo-bar</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sampleapp-runtime/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sampleapp-runtime/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp-runtime/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml
new file mode 100644
index 000000000..4d628d01e
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>sampleapp</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: sampleapp</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/sampleapp/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..f0576a126
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>sampleapp</application>
+  <version>1</version>
+  <runtime>java8</runtime>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/sampleapp/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/sampleapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/sampleapp/src/main/webapp/foo.jsp b/e2etests/testlocalapps/sampleapp/src/main/webapp/foo.jsp
new file mode 100644
index 000000000..312e1c50f
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp/src/main/webapp/foo.jsp
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+  <%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>JSP Page</title>
+    </head>
+    <body>
+        <h1>Hello World!</h1>
+    </body>
+</html>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp/src/main/webapp/nested/dukebanner.html b/e2etests/testlocalapps/sampleapp/src/main/webapp/nested/dukebanner.html
new file mode 100644
index 000000000..a2223c074
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp/src/main/webapp/nested/dukebanner.html
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+  <table border="0" width="400" cellspacing="0" 
+              cellpadding="0">
+
+<tr>
+<td height="150" width="150"> &nbsp; </td>
+<td width="250"> &nbsp; </td>
+</tr>
+
+<tr>
+<td width="150"> &nbsp; </td>
+<td align="right" width="250"> 
+I'm lazy, this should be an image.
+</tr>
+
+</table>
+<br>
diff --git a/e2etests/testlocalapps/sampleapp/src/main/webapp/nested/testing.jsp b/e2etests/testlocalapps/sampleapp/src/main/webapp/nested/testing.jsp
new file mode 100644
index 000000000..3a857cafb
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp/src/main/webapp/nested/testing.jsp
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<%@ page info="a hello world example" %>
+
+<html>
+<head><title>Hello, World</title></head>
+<body bgcolor="#ffffff" background="background.gif">
+
+<%@ include file="dukebanner.html" %>
+
+<table>
+<tr>
+<td width=150> &nbsp; </td>
+<td width=250 align=right> <h1>Hello, World!</h1> </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/e2etests/testlocalapps/sampleapp/src/main/webapp/random.html b/e2etests/testlocalapps/sampleapp/src/main/webapp/random.html
new file mode 100644
index 000000000..259193564
--- /dev/null
+++ b/e2etests/testlocalapps/sampleapp/src/main/webapp/random.html
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+<title>Nonsense</title>
+</head><body>
+This is just a test file.
+</body>
+</html>
diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml
new file mode 100644
index 000000000..44c427c60
--- /dev/null
+++ b/e2etests/testlocalapps/stage-sampleapp/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>stage-sampleapp</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: stage-sampleapp</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/stage-sampleapp/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/stage-sampleapp/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..b2baac44f
--- /dev/null
+++ b/e2etests/testlocalapps/stage-sampleapp/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+
+  <runtime>java8</runtime>
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <threadsafe>true</threadsafe>
+
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/stage-sampleapp/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/stage-sampleapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..a8d770886
--- /dev/null
+++ b/e2etests/testlocalapps/stage-sampleapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/stage-with-staging-options/pom.xml b/e2etests/testlocalapps/stage-with-staging-options/pom.xml
new file mode 100644
index 000000000..c9c39b290
--- /dev/null
+++ b/e2etests/testlocalapps/stage-with-staging-options/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>stage-with-staging-options</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: stage-with-staging-options</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/stage-with-staging-options/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/stage-with-staging-options/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..519a7c332
--- /dev/null
+++ b/e2etests/testlocalapps/stage-with-staging-options/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files />
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files />
+
+  <threadsafe>true</threadsafe>
+  <runtime>java8</runtime>
+
+  <staging>
+    <jar-splitting-excludes>foo,bar</jar-splitting-excludes>
+    <delete-jsps>true</delete-jsps>
+    <compile-encoding>UTF-16</compile-encoding>
+  </staging>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/stage-with-staging-options/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/stage-with-staging-options/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..b7465d323
--- /dev/null
+++ b/e2etests/testlocalapps/stage-with-staging-options/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>valid</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml
new file mode 100644
index 000000000..bc0d8186e
--- /dev/null
+++ b/e2etests/testlocalapps/xmlorder/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.google.appengine.demos</groupId>
+    <artifactId>xmlorder</artifactId>
+    <version>0.0.2-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <name>AppEngine :: xmlorder</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <!-- Include Servlet API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>2.4.4</version>
+                <configuration>
+                    <!-- can be set w/ -DprojectId=myProjectId on command line -->
+                    <projectId>ludo-in-in</projectId>
+                    <!--promote>false</promote-->
+                    <version>demo</version>
+                    <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/appengine-web.xml b/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..68f87c78a
--- /dev/null
+++ b/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+
+  <!-- files in the war, other than WEB-INF, which are java resources: none -->
+  <resource-files/>
+
+  <!-- files in the war which are servable as statics: none -->
+  <static-files/>
+
+  <threadsafe>true</threadsafe>
+  <runtime>java8</runtime>
+
+  <version>1</version>
+  <application>sampleapp</application>
+</appengine-web-app>
diff --git a/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/cron.xml b/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/cron.xml
new file mode 100644
index 000000000..d087a5ebc
--- /dev/null
+++ b/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/cron.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<cronentries>
+  <cron>
+    <timezone>HST</timezone>
+    <schedule>every 2 hours</schedule>
+    <url>http://nowhere/fast</url>
+  </cron>
+  <cron>
+    <schedule>every 3 hours</schedule>
+    <url>http://nowhere</url>
+    <description>Why it's here</description>
+  </cron>
+</cronentries>
diff --git a/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/queue.xml b/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/queue.xml
new file mode 100644
index 000000000..35b17fadf
--- /dev/null
+++ b/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/queue.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<queue-entries>
+  <queue>
+    <name>a-name</name>
+    <rate>5/s</rate>
+    <bucket-size>3</bucket-size>
+  </queue>
+  <queue>
+    <name>b-name</name>
+    <rate>0</rate>
+  </queue>
+  <queue>
+    <name>c-name</name>
+    <rate>10/m</rate>
+  </queue>
+  <queue>
+    <name>d-name</name>
+    <retry-parameters>
+      <task-retry-limit>100</task-retry-limit>
+    </retry-parameters>
+    <mode>pull</mode>
+    <acl>
+      <writer-email>prometheus-eng@googl.com</writer-email>
+    </acl>
+  </queue>
+  <queue>
+    <name>e-name</name>
+    <mode>pull</mode>
+    <acl>
+      <user-email>prometheus-eng@googl.com</user-email>
+      <writer-email>prometheus-eng@googl.com</writer-email>
+      <user-email>prometheus-eng-2@googl.com</user-email>
+      <writer-email>prometheus-eng-2@googl.com</writer-email>
+    </acl>
+  </queue>
+</queue-entries>
diff --git a/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/web.xml b/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..917096f25
--- /dev/null
+++ b/e2etests/testlocalapps/xmlorder/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+
+  <servlet>
+    <servlet-name>userapp</servlet-name>
+    <servlet-class>
+       com.google.apphosting.securitycontest.sampleapp.SampleAppServlet
+    </servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>userapp</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <session-config>
+    <session-timeout>300</session-timeout>  <!-- 5hr session -->
+  </session-config>
+
+</web-app>
diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml
index e716ea7c1..9e16b6755 100644
--- a/external/geronimo_javamail/pom.xml
+++ b/external/geronimo_javamail/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.17-SNAPSHOT</version>
+        <version>2.0.20-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-javamail_1.4_spec</artifactId>
     <packaging>jar</packaging>
     <name>AppEngine :: JavaMail 1.4</name>
-    <version>1.4.4-${project.parent.version}</version>
+    <version>1.4.4-3.0.19-SNAPSHOT</version>
 
     <description>Javamail 1.4 Specification with AppEngine updates.</description>
 
diff --git a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml
index c8630c110..71b7274b9 100644
--- a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml
+++ b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.19-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/NoSerializeImmutableTest.java b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/NoSerializeImmutableTest.java
index 4254dcb95..f3bc6ef19 100644
--- a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/NoSerializeImmutableTest.java
+++ b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/NoSerializeImmutableTest.java
@@ -86,7 +86,7 @@ public class NoSerializeImmutableTest {
   public void serializableCollectionFieldsAreNotGuavaImmutable() throws Exception {
     File appengineApiJar =
         new File(
-            "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.17-SNAPSHOT.jar");
+            "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.19-SNAPSHOT.jar");
     assertThat(appengineApiJar.exists()).isTrue();
     ClassLoader apiJarClassLoader = new URLClassLoader(new URL[] {appengineApiJar.toURI().toURL()});
     Class<?> messageLite =
diff --git a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/usage/ApiExhaustiveUsageTestCase.java b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/usage/ApiExhaustiveUsageTestCase.java
index 0a522f7ef..055546196 100644
--- a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/usage/ApiExhaustiveUsageTestCase.java
+++ b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/usage/ApiExhaustiveUsageTestCase.java
@@ -54,7 +54,7 @@ public abstract class ApiExhaustiveUsageTestCase {
 
   /** The path to the sdk api jar. */
   private static final String API_JAR_PATH =
-      "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.17-SNAPSHOT.jar";
+      "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.19-SNAPSHOT.jar";
 
     private boolean isExhaustiveUsageClass(String clsName) {
         return clsName.startsWith("com.google.appengine.apicompat.usage");
diff --git a/lib/pom.xml b/lib/pom.xml
index 015b157af..dff76bcd2 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
 
diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml
index 2451fa917..ed879dd28 100644
--- a/lib/tools_api/pom.xml
+++ b/lib/tools_api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>lib-parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
@@ -268,7 +268,7 @@
               </filters>
               <artifactSet>
                 <includes>
-                  <include>com.esotericsoftware.yamlbeans:yamlbeans</include>
+                  <include>com.contrastsecurity:yamlbeans</include>
                   <include>com.google.appengine:appengine-apis</include>
                   <include>com.google.appengine:appengine-apis-dev</include>
                   <include>com.google.appengine:protos</include>
diff --git a/lib/tools_api/src/test/java/com/google/appengine/tools/admin/AppAdminImplTest.java b/lib/tools_api/src/test/java/com/google/appengine/tools/admin/AppAdminImplTest.java
new file mode 100644
index 000000000..d35399cb3
--- /dev/null
+++ b/lib/tools_api/src/test/java/com/google/appengine/tools/admin/AppAdminImplTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.appengine.tools.admin;
+
+import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.rules.TemporaryFolder;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+/** Unit tests for {@link AppAdminImpl}. */
+@RunWith(JUnit4.class)
+public class AppAdminImplTest {
+
+  @Rule public final MockitoRule mockito = MockitoJUnit.rule();
+
+  @Mock private GenericApplication app;
+  @Mock private PrintWriter errorWriter;
+  @Mock private ApplicationProcessingOptions appOptions;
+
+  private AppAdminImpl appAdmin;
+
+  @Before
+  public void setUp() {
+    when(app.getAppId()).thenReturn("app1");
+    when(app.getModule()).thenReturn("module1");
+    when(app.getVersion()).thenReturn("v1");
+
+    appAdmin = new AppAdminImpl(app, errorWriter, appOptions);
+  }
+
+  @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  @Test
+  public void testStageApplicationWithDefaultResourceLimits() throws Exception {
+    temporaryFolder.create();
+    File stagingDir = temporaryFolder.getRoot();
+    when(app.createStagingDirectory(any(ApplicationProcessingOptions.class), eq(stagingDir)))
+        .thenReturn(new File("a/b"));
+
+    appAdmin.stageApplicationWithDefaultResourceLimits(stagingDir);
+
+    verify(app).resetProgress();
+    verify(app).setDetailsWriter(any(PrintWriter.class));
+  }
+
+  @Test
+  public void testStageApplicationNonEmptyDir() throws IOException {
+    temporaryFolder.create();
+    File stagingDir = temporaryFolder.getRoot();
+    File newFile = new File(stagingDir, "test.file");
+
+    if (!newFile.createNewFile()) {
+      throw new IOException("Failed when setting up test - could not create file");
+    }
+
+    assertThrows(
+        stagingDir.getPath() + " is not a valid staging directory (it is not empty)",
+        AdminException.class,
+        () -> appAdmin.stageApplication(stagingDir, /* useRemoteResourceLimits= */ false));
+  }
+
+  @Test
+  public void testStageApplicationRegularFile() throws IOException {
+    temporaryFolder.create();
+    File stagingDir = temporaryFolder.getRoot();
+    File badStageDir = new File(stagingDir, "test.file");
+
+    if (!badStageDir.createNewFile()) {
+      throw new IOException("Failed when setting up test - could not create file");
+    }
+
+    assertThrows(
+        badStageDir.getPath() + " is not a valid staging directory (it is a regular file)",
+        AdminException.class,
+        () -> appAdmin.stageApplication(badStageDir, /* useRemoteResourceLimits= */ false));
+  }
+}
diff --git a/lib/tools_api/src/test/java/com/google/appengine/tools/admin/AppYamlTranslatorTest.java b/lib/tools_api/src/test/java/com/google/appengine/tools/admin/AppYamlTranslatorTest.java
index 351bb5236..bd4f4a058 100644
--- a/lib/tools_api/src/test/java/com/google/appengine/tools/admin/AppYamlTranslatorTest.java
+++ b/lib/tools_api/src/test/java/com/google/appengine/tools/admin/AppYamlTranslatorTest.java
@@ -2761,7 +2761,7 @@ public void testHttpHeaders() {
         appEngineWebXml.includeStaticPattern("/my-static-files/*", null);
     Map<String, String> httpHeaders = staticFileInclude.getHttpHeaders();
     httpHeaders.put("foo", "1");
-    httpHeaders.put("bar", "2");
+    httpHeaders.put("bar", "barf");
 
     AppYamlTranslator translator = createTranslator();
     String yaml =
@@ -2778,8 +2778,8 @@ public void testHttpHeaders() {
             + "  login: optional\n"
             + "  secure: optional\n"
             + "  http_headers:\n"
-            + "    foo: '1'\n"
-            + "    bar: '2'\n"
+            + "    foo: 1\n"
+            + "    bar: barf\n"
             + "- url: /\n"
             + "  script: unused\n"
             + "  login: optional\n"
@@ -2793,6 +2793,7 @@ public void testHttpHeaders() {
             + "  login: optional\n"
             + "  secure: optional\n";
     assertEquals(yaml, translator.getYaml());
+    
   }
 
   public void testBackends() {
diff --git a/lib/tools_api/src/test/java/com/google/appengine/tools/admin/XmlYamlIntegrationTest.java b/lib/tools_api/src/test/java/com/google/appengine/tools/admin/XmlYamlIntegrationTest.java
new file mode 100644
index 000000000..52bdbe205
--- /dev/null
+++ b/lib/tools_api/src/test/java/com/google/appengine/tools/admin/XmlYamlIntegrationTest.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.appengine.tools.admin;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.google.appengine.tools.info.Version;
+import com.google.apphosting.utils.config.AppEngineWebXml;
+import com.google.apphosting.utils.config.AppEngineWebXml.ApiConfig;
+import com.google.apphosting.utils.config.AppEngineWebXmlReader;
+import com.google.apphosting.utils.config.BackendsXml;
+import com.google.apphosting.utils.config.WebXml;
+import com.google.apphosting.utils.config.WebXmlReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
+import junit.framework.TestCase;
+
+/**
+ * An integration test that tests the relationship between {@link WebXmlReader}, {@link
+ * AppEngineWebXmlReader} and {@link AppYamlTranslator}. The first two classes read XML text
+ * corresponding to web.xml and appengine-web.xml and produce {@link WebXml} and {@link
+ * AppEngineWebXml} objects respectively. The second class takes these objects and produces an
+ * app.yaml in the Python App Engine style. We test that the output yaml expresses the same
+ * semantics as the input XML.
+ *
+ * <p>This test is similar to {@code AppYamlTranslatorTest} except that that test builds {@link
+ * WebXml} and {@link AppEngineWebXml} object programmatically instead of by parsing text.
+ *
+ * <p>In this test we specify XML text to read and expected Yaml text to write and test that we
+ * generate the expected Yaml text.
+ *
+ * @author rudominer@google.com (Mitch Rudominer)
+ */
+public class XmlYamlIntegrationTest extends TestCase {
+
+  // @formatter:off
+  private static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+
+  private static final String WEB_XML_PREFIX =
+      XML_HEADER
+          + "\n"
+          + "<web-app  version=\"2.5\">\n"
+          + "  <servlet>\n"
+          + "    <servlet-name>Servlet1</servlet-name>\n"
+          + "    <servlet-class>com.test.Servlet1</servlet-class>\n"
+          + "  </servlet>";
+  private static final String WEB_XML_SUFFIX = "</web-app>";
+
+  private static final String AE_WEB_XML_PREFIX =
+      XML_HEADER
+          + "<appengine-web-app xmlns=\"http://appengine.google.com/ns/1.0\">\n"
+          + "  <application>my_app_id</application>\n"
+          + "  <version>1</version>\n"
+          + "  <threadsafe>true</threadsafe>\n";
+  private static final String AE_WEB_XML_SUFFIX = "</appengine-web-app>";
+
+  private static final String APP_YAML_PREFIX =
+      "application: 'my_app_id'\n"
+          + "runtime: java8\n"
+          + "version: '1'\n"
+          + "inbound_services:\n"
+          + "- warmup\n"
+          + "derived_file_type:\n"
+          + "- java_precompiled\n"
+          + "threadsafe: True\n"
+          + "auto_id_policy: default\n"
+          + "api_version: '1.7.3'\n"
+          + "handlers:\n";
+  private static final String APP_YAML_SUFFIX =
+      "- url: /.*/\n"
+          + "  script: unused\n"
+          + "  login: optional\n"
+          + "  secure: optional\n"
+          + "- url: /_ah/.*\n"
+          + "  script: unused\n"
+          + "  login: optional\n"
+          + "  secure: optional\n";
+  // @formatter:on
+
+  private static String buildWebXml(String content) {
+    return WEB_XML_PREFIX + content + WEB_XML_SUFFIX;
+  }
+
+  private static String buildAEWebXml(String content) {
+    return AE_WEB_XML_PREFIX + content + AE_WEB_XML_SUFFIX;
+  }
+
+  private static String buildYaml(String content, boolean useYamlSuffix) {
+    String suffix = (useYamlSuffix ? APP_YAML_SUFFIX : "");
+    return APP_YAML_PREFIX + content + suffix;
+  }
+
+  /**
+   * Tests that a security constraint with a url pattern of the form {@code /baz/*} will generate
+   * yaml containing a regex that also captures the path {@code /baz}.
+   *
+   * @throws Exception
+   */
+  public void testSecurityConstraintWildcard() throws Exception {
+    // @formatter:off
+    String webXmlString =
+        "<servlet-mapping>\n"
+            + "  <servlet-name>Servlet1</servlet-name>\n"
+            + "  <url-pattern>/main</url-pattern>\n"
+            + "  <url-pattern>/main/submit</url-pattern>\n"
+            + "</servlet-mapping>\n"
+            + "<security-constraint>\n"
+            + "    <web-resource-collection>\n"
+            + "      <web-resource-name>any</web-resource-name>\n"
+            + "      <url-pattern>/main/*</url-pattern>\n"
+            + "    </web-resource-collection>\n"
+            + "    <auth-constraint>\n"
+            + "      <role-name>admin</role-name>\n"
+            + "    </auth-constraint>\n"
+            + "    <user-data-constraint>\n"
+            + "      <transport-guarantee>CONFIDENTIAL</transport-guarantee>\n"
+            + "    </user-data-constraint>\n"
+            + "</security-constraint>";
+    String appEngineWebXmlString = "";
+    String expectedExtraYaml =
+        "- url: /main/.*/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: optional\n"
+            + "- url: /main\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /main/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /main/submit\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n";
+    // @formatter:on
+    doTest(webXmlString, appEngineWebXmlString, expectedExtraYaml);
+  }
+
+  /**
+   * Following on the previous test, tests that if {@code /baz} is explicitly specified in a
+   * security constraint in addition to {@code /baz/*} then we will generate yaml containing only a
+   * single regex that also captures the path {@code /baz}.
+   *
+   * @throws Exception
+   */
+  public void testSecurityConstraintWildcard2() throws Exception {
+    // @formatter:off
+    String webXmlString =
+        "<servlet-mapping>\n"
+            + "  <servlet-name>Servlet1</servlet-name>\n"
+            + "  <url-pattern>/main</url-pattern>\n"
+            + "  <url-pattern>/main/submit</url-pattern>\n"
+            + "</servlet-mapping>\n"
+            + "<security-constraint>\n"
+            + "    <web-resource-collection>\n"
+            + "      <web-resource-name>any</web-resource-name>\n"
+            + "      <url-pattern>/main</url-pattern>\n"
+            + "      <url-pattern>/main/*</url-pattern>\n"
+            + "    </web-resource-collection>\n"
+            + "    <auth-constraint>\n"
+            + "      <role-name>admin</role-name>\n"
+            + "    </auth-constraint>\n"
+            + "    <user-data-constraint>\n"
+            + "      <transport-guarantee>CONFIDENTIAL</transport-guarantee>\n"
+            + "    </user-data-constraint>\n"
+            + "</security-constraint>";
+    String appEngineWebXmlString = "";
+    String expectedExtraYaml =
+        "- url: /main/.*/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: optional\n"
+            + "- url: /main\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /main/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /main/submit\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n";
+    // @formatter:on
+    doTest(webXmlString, appEngineWebXmlString, expectedExtraYaml);
+  }
+
+  /**
+   * In this test we supply the glob /* within a security constraint to make sure that is handled
+   * correctly.
+   *
+   * @throws Exception
+   */
+  public void testSecurityConstraintWildcard3() throws Exception {
+    // @formatter:off
+    String webXmlString =
+        "<servlet-mapping>\n"
+            + "  <servlet-name>Servlet1</servlet-name>\n"
+            + "  <url-pattern>/main</url-pattern>\n"
+            + "  <url-pattern>/main/submit</url-pattern>\n"
+            + "</servlet-mapping>\n"
+            + "<security-constraint>\n"
+            + "    <web-resource-collection>\n"
+            + "      <web-resource-name>any</web-resource-name>\n"
+            + "      <url-pattern>/*</url-pattern>\n"
+            + "    </web-resource-collection>\n"
+            + "    <auth-constraint>\n"
+            + "      <role-name>admin</role-name>\n"
+            + "    </auth-constraint>\n"
+            + "    <user-data-constraint>\n"
+            + "      <transport-guarantee>CONFIDENTIAL</transport-guarantee>\n"
+            + "    </user-data-constraint>\n"
+            + "</security-constraint>";
+    String appEngineWebXmlString = "";
+    String expectedExtraYaml =
+        "- url: /\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /.*/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /_ah/.*\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /main/submit\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /main\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n";
+    // @formatter:on
+    doTest(webXmlString, appEngineWebXmlString, expectedExtraYaml, false);
+  }
+
+  /**
+   * In this test we specify a security constraint but there is no matching servlet path. The
+   * security constraint will still have an effect on the generated yaml because of the welcome
+   * files.
+   *
+   * @throws Exception
+   */
+  public void testSecurityConstraintWithoutMatch() throws Exception {
+    // @formatter:off
+    String webXmlString =
+        "<security-constraint>\n"
+            + "    <web-resource-collection>\n"
+            + "      <web-resource-name>any</web-resource-name>\n"
+            + "      <url-pattern>/main/*</url-pattern>\n"
+            + "    </web-resource-collection>\n"
+            + "    <user-data-constraint>\n"
+            + "      <transport-guarantee>CONFIDENTIAL</transport-guarantee>\n"
+            + "    </user-data-constraint>\n"
+            + "</security-constraint>";
+    String appEngineWebXmlString = "";
+    String expectedExtraYaml =
+        "- url: /main/.*/\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: always\n"
+            + "- url: /\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: optional\n"
+            + "- url: /main/\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: always\n";
+    // @formatter:on
+    doTest(webXmlString, appEngineWebXmlString, expectedExtraYaml);
+  }
+
+  private void doTest(String webXmlString, String appEngineWebXmlString, String expectedExtraYaml) {
+    doTest(webXmlString, appEngineWebXmlString, expectedExtraYaml, true);
+  }
+
+  private void doTest(
+      String webXmlString,
+      String appEngineWebXmlString,
+      String expectedExtraYaml,
+      boolean useYamlSuffix) {
+    WebXml webXml = new WebXmlStringReader(buildWebXml(webXmlString)).readWebXml();
+    AppEngineWebXml aeWebXml =
+        new AEWebXmlStringReader(buildAEWebXml(appEngineWebXmlString)).readAppEngineWebXml();
+    Set<String> staticFiles = new HashSet<String>();
+    ApiConfig apiConfig = null;
+    BackendsXml backendsXml = new BackendsXml();
+    AppYamlTranslator translator =
+        new AppYamlTranslator(
+            aeWebXml,
+            webXml,
+            backendsXml,
+            "1.7.3",
+            staticFiles,
+            apiConfig,
+            "java8",
+            Version.UNKNOWN);
+    assertEquals(buildYaml(expectedExtraYaml, useYamlSuffix), translator.getYaml());
+  }
+
+  private class WebXmlStringReader extends WebXmlReader {
+    private String xml;
+
+    public WebXmlStringReader(String xml) {
+      super(".");
+      this.xml = xml;
+    }
+
+    @Override
+    protected InputStream getInputStream() {
+      return new ByteArrayInputStream(xml.getBytes(UTF_8));
+    }
+  }
+
+  private class AEWebXmlStringReader extends AppEngineWebXmlReader {
+    private final String xml;
+
+    public AEWebXmlStringReader(String xml) {
+      super(".");
+      this.xml = xml;
+    }
+
+    @Override
+    protected InputStream getInputStream() {
+      return new ByteArrayInputStream(xml.getBytes(UTF_8));
+    }
+  }
+}
diff --git a/lib/tools_api/src/test/java/com/google/appengine/tools/admin/YamlXmlIntegrationTest.java b/lib/tools_api/src/test/java/com/google/appengine/tools/admin/YamlXmlIntegrationTest.java
new file mode 100644
index 000000000..ab14b407a
--- /dev/null
+++ b/lib/tools_api/src/test/java/com/google/appengine/tools/admin/YamlXmlIntegrationTest.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.appengine.tools.admin;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.google.appengine.tools.info.Version;
+import com.google.apphosting.utils.config.AppEngineWebXml;
+import com.google.apphosting.utils.config.AppEngineWebXml.ApiConfig;
+import com.google.apphosting.utils.config.AppYaml;
+import com.google.apphosting.utils.config.BackendsXml;
+import com.google.apphosting.utils.config.WebXml;
+import com.google.apphosting.utils.config.WebXmlReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.util.HashSet;
+import java.util.Set;
+import junit.framework.TestCase;
+
+/**
+ * An integration test that tests the relationship between {@link AppYaml} and {@link
+ * AppYamlTranslator}. The first class takes an app.yaml in the Java App Engine style and produces a
+ * web.xml. The second class takes a web.xml and produces an app.yaml in the Python App Engine
+ * style. We test that the output yaml expresses the same semantics as the input yaml.
+ *
+ * <p>As of this writing we are primarily concerned with the translation of the security-related
+ * elements, "secure:" and "login:".
+ *
+ * @author rudominer@google.com (Mitch Rudominer)
+ */
+public class YamlXmlIntegrationTest extends TestCase {
+
+  private static final String YAML_INPUT_PREFIX = "application: app1\n" + "handlers:\n";
+
+  private static final String EXPECTED_YAML_OUTPUT_PREFIX =
+      "application: 'app1'\n"
+          + "runtime: java7\n"
+          + "version: 'ver1'\n"
+          + "auto_id_policy: default\n"
+          + "api_version: '1.0'\n"
+          + "handlers:\n";
+
+  private AppEngineWebXml appEngineWebXml;
+  private BackendsXml backendsXml;
+  private Set<String> staticFiles;
+  private ApiConfig apiConfig;
+
+  @Override
+  public void setUp() throws Exception {
+    appEngineWebXml = new AppEngineWebXml();
+    appEngineWebXml.setAppId("app1");
+    appEngineWebXml.setMajorVersionId("ver1");
+    appEngineWebXml.setPrecompilationEnabled(false);
+    backendsXml = new BackendsXml();
+    staticFiles = new HashSet<String>();
+  }
+
+  /** Tests the case that only the admin pages require admin login. */
+  public void testAdminLoginOnly() {
+    String yamlInput = YAML_INPUT_PREFIX + " - url: /admin/*\n" + "   login: admin\n";
+
+    String expectedYamlOutput =
+        EXPECTED_YAML_OUTPUT_PREFIX
+            + "- url: /admin/.*/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: optional\n"
+            + "- url: /\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: optional\n"
+            + "- url: /admin/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: optional\n"
+            + "- url: /.*/\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: optional\n"
+            + "- url: /_ah/.*\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: optional\n";
+
+    doYamlXmlIntegrationTest(yamlInput, expectedYamlOutput);
+  }
+
+  /** Tests the case that all pages require login and the admin pages require admin login */
+  public void testLoginRequiredOnly() {
+    String yamlInput =
+        YAML_INPUT_PREFIX
+            + " - url: /*\n"
+            + "   login: required\n"
+            + " - url: /admin/*\n"
+            + "   login: admin\n";
+
+    String expectedYamlOutput =
+        EXPECTED_YAML_OUTPUT_PREFIX
+            + "- url: /admin/.*/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: optional\n"
+            + "- url: /\n"
+            + "  script: unused\n"
+            + "  login: required\n"
+            + "  secure: optional\n"
+            + "- url: /admin/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: optional\n"
+            + "- url: /.*/\n"
+            + "  script: unused\n"
+            + "  login: required\n"
+            + "  secure: optional\n"
+            + "- url: /_ah/.*\n"
+            + "  script: unused\n"
+            + "  login: required\n"
+            + "  secure: optional\n";
+
+    doYamlXmlIntegrationTest(yamlInput, expectedYamlOutput);
+  }
+
+  /** Tests the case that https is required on all pages, but no login */
+  public void testSSLOnly() {
+    String yamlInput = YAML_INPUT_PREFIX + " - url: /*\n" + "   secure: always\n";
+
+    String expectedYamlOutput =
+        EXPECTED_YAML_OUTPUT_PREFIX
+            + "- url: /\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: always\n"
+            + "- url: /.*/\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: always\n"
+            + "- url: /_ah/.*\n"
+            + "  script: unused\n"
+            + "  login: optional\n"
+            + "  secure: always\n";
+
+    doYamlXmlIntegrationTest(yamlInput, expectedYamlOutput);
+  }
+
+  /**
+   * Tests the case that login is required on all pages, admin login on admin pages, and https is
+   * required on all pages.
+   */
+  public void testLoginAndSSL() {
+    String yamlInput =
+        YAML_INPUT_PREFIX
+            + " - url: /*\n"
+            + "   login: required\n"
+            + "   secure: always\n"
+            + " - url: /admin/*\n"
+            + "   login: admin\n"
+            + "   secure: always\n";
+
+    String expectedYamlOutput =
+        EXPECTED_YAML_OUTPUT_PREFIX
+            + "- url: /admin/.*/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /\n"
+            + "  script: unused\n"
+            + "  login: required\n"
+            + "  secure: always\n"
+            + "- url: /admin/\n"
+            + "  script: unused\n"
+            + "  login: admin\n"
+            + "  secure: always\n"
+            + "- url: /.*/\n"
+            + "  script: unused\n"
+            + "  login: required\n"
+            + "  secure: always\n"
+            + "- url: /_ah/.*\n"
+            + "  script: unused\n"
+            + "  login: required\n"
+            + "  secure: always\n";
+
+    doYamlXmlIntegrationTest(yamlInput, expectedYamlOutput);
+  }
+
+  private void doYamlXmlIntegrationTest(String yamlIn, String expectedYamlOut) {
+    // Use the AppYaml class to parse the input yaml string
+    AppYaml yaml = AppYaml.parse(String.format(yamlIn, "app1"));
+    // Use the AppYaml class to generate a WebXml
+    WebXml xml = getWebXml(yaml);
+    // Use AppYamlTranslator to generate an app.yaml from the WebXml
+    // and check the output.
+    AppYamlTranslator translator = createTranslator(xml);
+    assertEquals(expectedYamlOut, translator.getYaml());
+  }
+
+  private AppYamlTranslator createTranslator(WebXml webXml) {
+    return new AppYamlTranslator(
+        appEngineWebXml,
+        webXml,
+        backendsXml,
+        "1.0",
+        staticFiles,
+        apiConfig,
+        "java7",
+        Version.UNKNOWN);
+  }
+
+  private WebXml getWebXml(AppYaml yaml) {
+    return new WebXmlStringReader(getWebXmlContents(yaml)).readWebXml();
+  }
+
+  private String getWebXmlContents(AppYaml yaml) {
+    StringWriter out = new StringWriter();
+    yaml.generateWebXml(out);
+    return out.toString();
+  }
+
+  private class WebXmlStringReader extends WebXmlReader {
+    private String xml;
+
+    public WebXmlStringReader(String xml) {
+      super(".");
+      this.xml = xml;
+    }
+
+    @Override
+    protected InputStream getInputStream() {
+      return new ByteArrayInputStream(xml.getBytes(UTF_8));
+    }
+  }
+}
diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml
index a715d1103..715b545af 100644
--- a/lib/xml_validator/pom.xml
+++ b/lib/xml_validator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>lib-parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: libxmlvalidator</name>
diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml
index c21274229..5f30b5266 100644
--- a/lib/xml_validator_test/pom.xml
+++ b/lib/xml_validator_test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>lib-parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: libxmlvalidator_test</name>
diff --git a/local_runtime_shared/pom.xml b/local_runtime_shared/pom.xml
index 8c68a1a84..d57015273 100644
--- a/local_runtime_shared/pom.xml
+++ b/local_runtime_shared/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-local-runtime-shared</name>
diff --git a/pom.xml b/pom.xml
index 115545820..bcd2c6777 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine</groupId>
   <artifactId>parent</artifactId>
-  <version>2.0.17-SNAPSHOT</version>
+  <version>2.0.20-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>AppEngine :: Parent project</name>
   <modules>
@@ -45,13 +45,14 @@
     <module>sdk_assembly</module>
     <module>applications</module>
     <module>appengine_testing_tests</module>
+    <module>e2etests</module>
   </modules>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jetty.version>9.4.51.v20230217</jetty.version>
+    <jetty.version>9.4.52.v20230823</jetty.version>
     <distributionManagement.snapshot.url>https://oss.sonatype.org/content/repositories/google-snapshots/</distributionManagement.snapshot.url>
     <distributionManagement.snapshot.id>sonatype-nexus-snapshots</distributionManagement.snapshot.id>
     <distributionManagement.release.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distributionManagement.release.url>
@@ -386,7 +387,7 @@
       <dependency>
         <groupId>com.google.cloud.datastore</groupId>
         <artifactId>datastore-v1-proto-client</artifactId>
-        <version>2.16.3</version>
+        <version>2.17.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.geometry</groupId>
@@ -396,7 +397,7 @@
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
-        <version>4.3</version>
+        <version>5.2.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.appengine</groupId>
@@ -433,23 +434,23 @@
       <dependency>
         <groupId>com.google.auto.value</groupId>
         <artifactId>auto-value</artifactId>
-        <version>1.10.2</version>
+        <version>1.10.4</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>com.google.auto.value</groupId>
         <artifactId>auto-value-annotations</artifactId>
-        <version>1.10.2</version>
+        <version>1.10.4</version>
       </dependency>
       <dependency>
-        <groupId>com.esotericsoftware.yamlbeans</groupId>
+        <groupId>com.contrastsecurity</groupId>
         <artifactId>yamlbeans</artifactId>
-        <version>1.11</version> <!--keep-->
+        <version>1.17</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-datastore-v1</artifactId>
-        <version>0.107.1</version>
+        <version>0.108.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -546,7 +547,7 @@
       <dependency>
         <groupId>org.apache.ant</groupId>
         <artifactId>ant</artifactId>
-        <version>1.10.13</version>
+        <version>1.10.14</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
@@ -562,7 +563,7 @@
       <dependency>
         <groupId>org.checkerframework</groupId>
         <artifactId>checker-qual</artifactId>
-        <version>3.37.0</version>
+        <version>3.38.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -626,22 +627,63 @@
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-api</artifactId>
-        <version>1.57.1</version>
+        <version>1.57.2</version>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-stub</artifactId>
-        <version>1.57.1</version>
+        <version>1.57.2</version>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-protobuf</artifactId>
-        <version>1.57.1</version>
+        <version>1.57.2</version>
       </dependency>
       <dependency>
          <groupId>io.grpc</groupId>
          <artifactId>grpc-netty</artifactId>
-         <version>1.57.1</version>
+         <version>1.57.2</version>
+      </dependency>
+      <!-- io.netty are transitive deps needed by io.grpc-->
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-buffer</artifactId>
+          <version>4.1.97.Final</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-codec</artifactId>
+          <version>4.1.97.Final</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-codec-http</artifactId>
+          <version>4.1.97.Final</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-codec-http2</artifactId>
+          <version>4.1.97.Final</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-common</artifactId>
+          <version>4.1.94.Final</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-handler</artifactId>
+          <version>4.1.97.Final</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport</artifactId>
+          <version>4.1.97.Final</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-unix-common</artifactId>
+          <version>4.1.97.Final</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomcat</groupId>
@@ -710,7 +752,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-logging</artifactId>
-        <version>3.15.7</version>
+        <version>3.15.8</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -719,7 +761,7 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>3.4.0</version>
             <executions>
                 <execution>
                     <id>enforce-maven</id>
@@ -812,7 +854,7 @@
         <plugin>
            <groupId>org.codehaus.mojo</groupId>
            <artifactId>javacc-maven-plugin</artifactId>
-           <version>2.6</version>
+           <version>3.0.1</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
diff --git a/protobuf/api/memcache_service.proto b/protobuf/api/memcache_service.proto
index 681778787..0f0a99454 100644
--- a/protobuf/api/memcache_service.proto
+++ b/protobuf/api/memcache_service.proto
@@ -33,6 +33,9 @@
 //      used as the top level namespace, and name_space is immediately below.
 //      If the name_space field is "", it is mapped to the app's root namespace.
 
+//
+// LINT: ALLOW_GROUPS
+
 syntax = "proto2";
 
 // Some generic_services option(s) added automatically.
@@ -102,6 +105,7 @@ message AppOverride {
   // NB: Can't use 'reserved' in this file, it needs to work with proto1.
 }
 
+// Next tag: 7
 message MemcacheGetRequest {
   repeated bytes key = 1;
   optional string name_space = 2 [default = ""];
@@ -115,8 +119,29 @@ message MemcacheGetRequest {
   optional bool for_cas = 4;
 
   optional AppOverride override = 5;
+
+  // If set true, returned items will include timestamps and indicate whether
+  // the item is delete_locked or not. Peeking at items will update stats, but
+  // will not alter the eviction order of the item.
+  optional bool for_peek = 6;  // default=FALSE
 }
 
+// Timestamps relevant to a memcache item.
+// Next tag: 4
+message ItemTimestamps {
+  // Absolute expiration timestamp of the item. Unset if this item has no
+  // expiration timestamp.
+  optional int64 expiration_time_sec = 1;
+
+  // Absolute last accessed timestamp of the item.
+  optional int64 last_access_time_sec = 2;
+
+  // Absolute delete_time timestamp of the item. Unset if this item is not
+  // delete locked.
+  optional int64 delete_lock_time_sec = 3;
+}
+
+// Next tag: 10
 message MemcacheGetResponse {
   // One item will be returned for each HIT, i.e. where the value was found for
   // the requested key.  Order is not specified.
@@ -136,6 +161,12 @@ message MemcacheGetResponse {
 
     // Relative to now.  Unset if this item has no expiration timestamp.
     optional int32 expires_in_seconds = 6;
+
+    // Item timestamps. Only returned if for_peek is set on the request.
+    optional ItemTimestamps timestamps = 8;
+
+    // Item is delete_locked. Only returned if for_peek is set on the request.
+    optional bool is_delete_locked = 9;
   }
 
   enum GetStatusCode {
@@ -167,6 +198,8 @@ message MemcacheGetResponse {
   }
   // One get_status will be returned for each requested key, in the same order
   // that the requests were in.
+  // TODO(b/290098535) This can return the wrong status code when there's a mix
+  // of hit/miss.
   repeated GetStatusCode get_status = 7;
 }
 
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
index db4bc4d95..306024c54 100644
--- a/protobuf/pom.xml
+++ b/protobuf/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml
index a3f437fc0..fcffd4bc4 100644
--- a/quickstartgenerator/pom.xml
+++ b/quickstartgenerator/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml
index 05ca7aed7..60b6e08b7 100644
--- a/remoteapi/pom.xml
+++ b/remoteapi/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-remote-api</name>
diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml
index d81f65230..9f4d1bd81 100644
--- a/runtime/annotationscanningwebapp/pom.xml
+++ b/runtime/annotationscanningwebapp/pom.xml
@@ -14,13 +14,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>1.0</version>
+    <version>1.1-SNAPSHOT</version>
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>annotationscanningwebapp</artifactId>
diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml
index ab2efa471..f14b318d7 100644
--- a/runtime/deployment/pom.xml
+++ b/runtime/deployment/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>pom</packaging>
diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml
index e6d09593d..5ec694ba6 100644
--- a/runtime/failinitfilterwebapp/pom.xml
+++ b/runtime/failinitfilterwebapp/pom.xml
@@ -14,13 +14,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>1.0</version>
+    <version>1.1-SNAPSHOT</version>
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>failinitfilterwebapp</artifactId>
diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml
index 756679b07..1f6fd3768 100644
--- a/runtime/impl/pom.xml
+++ b/runtime/impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>runtime-parent</artifactId>
-        <version>2.0.17-SNAPSHOT</version>
+        <version>2.0.20-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
@@ -36,7 +36,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>com.esotericsoftware.yamlbeans</groupId>
+            <groupId>com.contrastsecurity</groupId>
             <artifactId>yamlbeans</artifactId>
             <optional>true</optional>
         </dependency>
@@ -211,7 +211,48 @@
           </exclusions>
             <optional>true</optional>
         </dependency>
-        <!-- Test dependencies. -->
+        <!-- io.netty are transitive deps needed by io.grpc-->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http2</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-unix-common</artifactId>
+            <optional>true</optional>
+        </dependency>
+      <!-- Test dependencies. -->
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-tools-sdk</artifactId>
@@ -359,7 +400,7 @@
                                     <include>javax.activation:activation</include>
                                     <include>org.apache.tomcat:juli</include>
                                     <include>com.beust:jcommander</include>
-                                    <include>com.esotericsoftware.yamlbeans:yamlbeans</include>
+                                    <include>com.contrastsecurity:yamlbeans</include>
                                     <include>com.fasterxml.jackson.core:jackson-core</include>
                                     <include>com.google.android:annotations</include>
                                     <include>com.google.api.grpc:proto-google-common-protos</include>
diff --git a/runtime/lite/pom.xml b/runtime/lite/pom.xml
index 7f67b1deb..027f3259e 100644
--- a/runtime/lite/pom.xml
+++ b/runtime/lite/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>runtime-parent</artifactId>
-        <version>2.0.17-SNAPSHOT</version>
+        <version>2.0.19-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/runtime/local/pom.xml b/runtime/local/pom.xml
index d61da4b64..8b44be723 100644
--- a/runtime/local/pom.xml
+++ b/runtime/local/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
@@ -228,7 +228,7 @@
                   </includes>
                 </filter>
                 <filter>
-                  <artifact>com.esotericsoftware.yamlbeans:yamlbeans</artifact>
+                  <artifact>com.contrastsecurity:yamlbeans</artifact>
                   <includes>
                     <!-- Used by apphosting/utils/config/QueueYamlReader -->
                     <include>com/esotericsoftware/yamlbeans/**</include>
diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml
index 551f3a1a1..f3082c622 100644
--- a/runtime/main/pom.xml
+++ b/runtime/main/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml
index b974fe558..0d86963bc 100644
--- a/runtime/nogaeapiswebapp/pom.xml
+++ b/runtime/nogaeapiswebapp/pom.xml
@@ -14,13 +14,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>1.0</version>
+    <version>1.1-SNAPSHOT</version>
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>nogaeapiswebapp</artifactId>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 81f170b80..2d5c4d314 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <name>AppEngine :: runtime projects</name>
   <packaging>pom</packaging>
diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml
index 613f962a6..c43114b96 100644
--- a/runtime/test/pom.xml
+++ b/runtime/test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
@@ -78,11 +78,6 @@
        <groupId>javax.activation</groupId>
        <artifactId>activation</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-apis-dev</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.flogger</groupId>
       <artifactId>google-extensions</artifactId>
diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml
index 560c3bc12..346d6a032 100644
--- a/runtime/testapps/pom.xml
+++ b/runtime/testapps/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml
index 9b6be0c18..431eec15a 100644
--- a/runtime/util/pom.xml
+++ b/runtime/util/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml
index 1a6f76d4f..113428dad 100644
--- a/runtime_shared/pom.xml
+++ b/runtime_shared/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.17-SNAPSHOT</version>
+        <version>2.0.20-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml
index c0ad46e0f..0f3713d3e 100644
--- a/sdk_assembly/pom.xml
+++ b/sdk_assembly/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.17-SNAPSHOT</version>
+        <version>2.0.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>appengine-java-sdk</artifactId>
@@ -276,11 +276,9 @@
                         <configuration>
                             <target>
                                 <chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
+                                <delete file="${assembly-directory}/jetty94/jetty-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.version}.jar" />
+                                <delete dir="${assembly-directory}/jetty94/jetty-home/demo-base" />
                             </target>
-                            <tasks>
-                                <delete file="${assembly-directory}/jetty94/jetty-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.version}.jar"/>
-                                <delete dir="${assembly-directory}/jetty94/jetty-home/demo-base"/>
-                            </tasks>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml
index f2c52b4cd..67e8fded7 100644
--- a/sessiondata/pom.xml
+++ b/sessiondata/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>
diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml
index 769a5ac7c..ddaa08059 100644
--- a/shared_sdk/pom.xml
+++ b/shared_sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.17-SNAPSHOT</version>
+        <version>2.0.20-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/utils/pom.xml b/utils/pom.xml
index 0c8c5b5e7..8eeed9136 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
@@ -51,7 +51,7 @@
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.esotericsoftware.yamlbeans</groupId>
+      <groupId>com.contrastsecurity</groupId>
       <artifactId>yamlbeans</artifactId>
     </dependency>
     <dependency>
diff --git a/utils/src/main/java/com/google/apphosting/utils/config/AppYaml.java b/utils/src/main/java/com/google/apphosting/utils/config/AppYaml.java
index 2ec4e9428..76001bbd6 100644
--- a/utils/src/main/java/com/google/apphosting/utils/config/AppYaml.java
+++ b/utils/src/main/java/com/google/apphosting/utils/config/AppYaml.java
@@ -16,9 +16,7 @@
 
 package com.google.apphosting.utils.config;
 
-import com.esotericsoftware.yamlbeans.YamlConfig;
 import com.esotericsoftware.yamlbeans.YamlException;
-import com.esotericsoftware.yamlbeans.YamlReader;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
@@ -1566,10 +1564,8 @@ public void generateWebXml(Writer writer) {
   }
 
   public static AppYaml parse(Reader reader) {
-    YamlReader yaml = new YamlReader(reader);
-    prepareParser(yaml.getConfig());
     try {
-      AppYaml appYaml = yaml.read(AppYaml.class);
+      AppYaml appYaml = YamlUtils.parse(reader, AppYaml.class);
       if (appYaml == null) {
         throw new YamlException("Unable to parse yaml file");
       }
@@ -1594,23 +1590,6 @@ public static AppYaml parse(String yaml) {
     return parse(new StringReader(yaml));
   }
 
-  public static void prepareParser(YamlConfig config) {
-    config.setPropertyElementType(AppYaml.class, "handlers", Handler.class);
-    config.setPropertyElementType(AppYaml.class, "static_files", StaticFile.class);
-    config.setPropertyElementType(AppYaml.class, "resource_files", ResourceFile.class);
-    config.setPropertyElementType(AppYaml.class, "system_properties", String.class);
-    config.setPropertyElementType(AppYaml.class, "context_params", String.class);
-    config.setPropertyElementType(AppYaml.class, "env_variables", String.class);
-    config.setPropertyElementType(AppYaml.class, "build_env_variables", String.class);
-    config.setPropertyElementType(AppYaml.class, "beta_settings", String.class);
-    config.setPropertyElementType(AppYaml.class, "welcome_files", String.class);
-    config.setPropertyElementType(AppYaml.class, "listeners", String.class);
-    config.setPropertyElementType(AppYaml.class, "inbound_services", String.class);
-    config.setPropertyElementType(Handler.class, "init_params", String.class);
-    config.setPropertyElementType(AdminConsole.class, "pages", AdminPage.class);
-    config.setPropertyElementType(AppYaml.class, "error_handlers", ErrorHandler.class);
-  }
-
   private void generateInclude(StaticFile include, XmlWriter xml) {
     Map<String, String> httpHeaders = include.getHttp_headers();
     if (httpHeaders == null || httpHeaders.isEmpty()) {
diff --git a/utils/src/main/java/com/google/apphosting/utils/config/BackendsYamlReader.java b/utils/src/main/java/com/google/apphosting/utils/config/BackendsYamlReader.java
index 47101b38a..f28aa1151 100644
--- a/utils/src/main/java/com/google/apphosting/utils/config/BackendsYamlReader.java
+++ b/utils/src/main/java/com/google/apphosting/utils/config/BackendsYamlReader.java
@@ -17,7 +17,6 @@
 package com.google.apphosting.utils.config;
 
 import com.esotericsoftware.yamlbeans.YamlException;
-import com.esotericsoftware.yamlbeans.YamlReader;
 import com.google.common.base.Joiner;
 import com.google.common.io.CharStreams;
 import java.io.File;
@@ -168,13 +167,9 @@ public static BackendsXml parse(Reader yaml) {
     } catch (IOException ex) {
       throw new AppEngineConfigException(ex.getMessage(), ex);
     }
-    YamlReader reader = new YamlReader(hackedYaml);
-    reader.getConfig().setPropertyElementType(BackendsYaml.class,
-                                              "backends",
-                                              BackendsYaml.Entry.class);
-
+    Reader reader = new StringReader(hackedYaml);
     try {
-      BackendsYaml backendsYaml = reader.read(BackendsYaml.class);
+      BackendsYaml backendsYaml = YamlUtils.parse(reader, BackendsYaml.class);
       if (backendsYaml == null) {
         throw new AppEngineConfigException("Empty backends configuration.");
       }
diff --git a/utils/src/main/java/com/google/apphosting/utils/config/CronYamlReader.java b/utils/src/main/java/com/google/apphosting/utils/config/CronYamlReader.java
index dca114e95..263bf4ce0 100644
--- a/utils/src/main/java/com/google/apphosting/utils/config/CronYamlReader.java
+++ b/utils/src/main/java/com/google/apphosting/utils/config/CronYamlReader.java
@@ -17,7 +17,6 @@
 package com.google.apphosting.utils.config;
 
 import com.esotericsoftware.yamlbeans.YamlException;
-import com.esotericsoftware.yamlbeans.YamlReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -208,10 +207,8 @@ public CronXml parse() {
   }
 
   private static CronYaml parseYaml(Reader yaml) {
-    YamlReader reader = new YamlReader(yaml);
-    reader.getConfig().setPropertyElementType(CronYaml.class, "cron", CronYaml.Cron.class);
     try {
-      CronYaml cronYaml = reader.read(CronYaml.class);
+      CronYaml cronYaml = YamlUtils.parse(yaml, CronYaml.class);
       if (cronYaml == null) {
         throw new AppEngineConfigException("Empty cron configuration.");
       }
diff --git a/utils/src/main/java/com/google/apphosting/utils/config/DispatchYamlReader.java b/utils/src/main/java/com/google/apphosting/utils/config/DispatchYamlReader.java
index 4c879265c..8f0398bfd 100644
--- a/utils/src/main/java/com/google/apphosting/utils/config/DispatchYamlReader.java
+++ b/utils/src/main/java/com/google/apphosting/utils/config/DispatchYamlReader.java
@@ -52,7 +52,6 @@ public String getFilename() {
   }
 
   public DispatchXml parse() {
-    DispatchXml result = null;
     try {
       return parseImpl(new FileReader(getFilename()));
     } catch (FileNotFoundException ex) {
@@ -63,11 +62,8 @@ public DispatchXml parse() {
 
   @VisibleForTesting
   static DispatchXml parseImpl(Reader yaml) {
-    YamlReader reader = new YamlReader(yaml);
-    reader.getConfig().setPropertyElementType(DispatchYaml.class, "dispatch",
-        DispatchYamlEntry.class);
     try {
-      DispatchYaml dispatchYaml = reader.read(DispatchYaml.class);
+      DispatchYaml dispatchYaml = YamlUtils.parse(yaml, DispatchYaml.class);
       if (dispatchYaml == null) {
         throw new AppEngineConfigException("Empty dispatch.yaml configuration.");
       }
diff --git a/utils/src/main/java/com/google/apphosting/utils/config/DosYamlReader.java b/utils/src/main/java/com/google/apphosting/utils/config/DosYamlReader.java
index 5ca0c0d0e..8a3fe4116 100644
--- a/utils/src/main/java/com/google/apphosting/utils/config/DosYamlReader.java
+++ b/utils/src/main/java/com/google/apphosting/utils/config/DosYamlReader.java
@@ -17,7 +17,6 @@
 package com.google.apphosting.utils.config;
 
 import com.esotericsoftware.yamlbeans.YamlException;
-import com.esotericsoftware.yamlbeans.YamlReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -82,12 +81,8 @@ public DosXml parse() {
   }
 
   public static DosXml parse(Reader yaml) {
-    YamlReader reader = new YamlReader(yaml);
-    reader.getConfig().setPropertyElementType(DosYaml.class,
-                                              "blacklist",
-                                              DosXml.BlacklistEntry.class);
     try {
-      DosYaml dosYaml = reader.read(DosYaml.class);
+      DosYaml dosYaml = YamlUtils.parse(yaml, DosYaml.class);
       if (dosYaml == null) {
         throw new AppEngineConfigException("Empty dos configuration.");
       }
diff --git a/utils/src/main/java/com/google/apphosting/utils/config/IndexYamlReader.java b/utils/src/main/java/com/google/apphosting/utils/config/IndexYamlReader.java
index 9fd37a861..db753760f 100644
--- a/utils/src/main/java/com/google/apphosting/utils/config/IndexYamlReader.java
+++ b/utils/src/main/java/com/google/apphosting/utils/config/IndexYamlReader.java
@@ -21,7 +21,6 @@
 import static com.google.apphosting.utils.config.IndexesXml.MODE_VALUE_GEOSPATIAL;
 
 import com.esotericsoftware.yamlbeans.YamlException;
-import com.esotericsoftware.yamlbeans.YamlReader;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.ArrayList;
@@ -53,23 +52,48 @@ public class IndexYamlReader {
    */
   public static class IndexYaml {
 
-    public String application;
+    private String application;
+
+    public String getApplication() {
+      return application;
+    }
+
+    public void setApplication(String application) {
+      this.application = application;
+    }
+
     /**
      * JavaBean wrapper for Index entries in IndexesXml.
      */
     public static class Index {
-      public String kind;
-      protected boolean ancestor;
-      public List<Property> properties;
+      private String kind;
+      private String ancestor;
+      private List<Property> properties;
+
+      public String getKind() {
+        return kind;
+      }
+
+      public void setKind(String kind) {
+        this.kind = kind;
+      }
 
       public void setAncestor(String ancestor) {
         // Curse yamlbeans and its noncompliance.
-        this.ancestor = YamlUtils.parseBoolean(ancestor);
+        this.ancestor = String.valueOf(YamlUtils.parseBoolean(ancestor));
       }
 
       public String getAncestor() {
         return "" + ancestor;
       }
+
+      public List<Property> getProperties() {
+        return properties;
+      }
+
+      public void setProperties(List<Property> properties) {
+        this.properties = properties;
+      }
     }
 
     /**
@@ -142,7 +166,8 @@ public IndexesXml toXml(IndexesXml xml) {
           if (yamlIndex.kind == null) {
             throw new AppEngineConfigException("Index missing required element 'kind'");
           }
-          IndexesXml.Index xmlIndex = xml.addNewIndex(yamlIndex.kind, yamlIndex.ancestor);
+          IndexesXml.Index xmlIndex =
+              xml.addNewIndex(yamlIndex.kind, Boolean.valueOf(yamlIndex.ancestor));
           if (yamlIndex.properties != null) {
             for (Property property : yamlIndex.properties) {
               if (property.getName() == null) {
@@ -158,7 +183,7 @@ public IndexesXml toXml(IndexesXml xml) {
     }
   }
 
-  public static IndexesXml parse(Reader yaml, IndexesXml xml) {
+  static IndexesXml parse(Reader yaml, IndexesXml xml) {
     List<IndexesXml> list;
     try {
       list = parseMultiple(yaml, xml);
@@ -189,25 +214,6 @@ public static IndexesXml parse(String yaml) {
     return parse(new StringReader(clean(yaml)), null);
   }
 
-  /**
-   * Parses the Yaml from {@code yaml} into one or more documents, and
-   * deserializes the documents into one or more instances of {@link IndexesXml}
-   * which are returned in a {@link List}.
-   *
-   * @param yaml A {@link String} from which to read the Yyaml. This String is
-   *        allowed to be in the style generated by the admin server, including
-   *        the Python-specific tags. This method will safely ignore those tags.
-   * @return A {@link List} of {@link IndexesXml} instances representing one or
-   *         more parsed Yaml documents.
-   */
-  public static List<IndexesXml> parseMultiple(String yaml) {
-    try {
-      return parseMultiple(new StringReader(clean(yaml)), null);
-    } catch (YamlException ex) {
-      throw new AppEngineConfigException(ex.getMessage(), ex);
-    }
-  }
-
   /**
    * Cleans a Yaml String by removing Pyton-specific tags.
    * These tags are written by the admin server when it generates
@@ -242,13 +248,9 @@ private static String clean(String yaml) {
    * @throws YamlException If the Yaml parser has trouble parsing.
    */
   private static List<IndexesXml> parseMultiple(Reader yaml, IndexesXml xml) throws YamlException {
-    YamlReader reader = new YamlReader(yaml);
-    reader.getConfig().setPropertyElementType(IndexYaml.class, "indexes", IndexYaml.Index.class);
-    reader.getConfig().setPropertyElementType(
-        IndexYaml.Index.class, "properties", IndexYaml.Property.class);
     List<IndexesXml> list = new ArrayList<IndexesXml>();
     while (true) {
-      IndexYaml indexYaml = reader.read(IndexYaml.class);
+      IndexYaml indexYaml = YamlUtils.parse(yaml, IndexYaml.class);
       if (null == indexYaml) {
         break;
       } else {
diff --git a/utils/src/main/java/com/google/apphosting/utils/config/QueueYamlReader.java b/utils/src/main/java/com/google/apphosting/utils/config/QueueYamlReader.java
index 19e0fa3ac..06906a6f5 100644
--- a/utils/src/main/java/com/google/apphosting/utils/config/QueueYamlReader.java
+++ b/utils/src/main/java/com/google/apphosting/utils/config/QueueYamlReader.java
@@ -17,7 +17,6 @@
 package com.google.apphosting.utils.config;
 
 import com.esotericsoftware.yamlbeans.YamlException;
-import com.esotericsoftware.yamlbeans.YamlReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -29,6 +28,7 @@
  * Class to parse queue.yaml into a QueueXml object.
  *
  */
+@SuppressWarnings("MemberName") // some methods use snake_case for YAML reflection
 public class QueueYamlReader {
 
   /**
@@ -153,7 +153,7 @@ public QueueXml.Entry toXml() {
     }
 
     private List<Queue> entries;
-    public String total_storage_limit;
+    private String total_storage_limit;
 
     public List<Queue> getQueue() {
       return entries;
@@ -163,6 +163,14 @@ public void setQueue(List<Queue> entries) {
       this.entries = entries;
     }
 
+    public String getTotal_storage_limit() {
+      return total_storage_limit;
+    }
+
+    public void setTotal_storage_limit(String totalStorageLimit) {
+      this.total_storage_limit = totalStorageLimit;
+    }
+
     public QueueXml toXml() {
       QueueXml xml = new QueueXml();
       if (total_storage_limit != null) {
@@ -200,15 +208,8 @@ public QueueXml parse() {
   }
 
   public static QueueYaml parseYaml(Reader yaml) {
-    YamlReader reader = new YamlReader(yaml);
-    reader.getConfig().setPropertyElementType(QueueYaml.class, "queue", QueueYaml.Queue.class);
-
     try {
-      QueueYaml queueYaml = reader.read(QueueYaml.class);
-      if (queueYaml == null) {
-        throw new AppEngineConfigException("Empty queue configuration.");
-      }
-      return queueYaml;
+      return YamlUtils.parse(yaml, QueueYaml.class);
     } catch (YamlException ex) {
       throw new AppEngineConfigException(ex.getMessage(), ex);
     }
diff --git a/utils/src/main/java/com/google/apphosting/utils/config/YamlUtils.java b/utils/src/main/java/com/google/apphosting/utils/config/YamlUtils.java
index de0314666..0103ba3d4 100644
--- a/utils/src/main/java/com/google/apphosting/utils/config/YamlUtils.java
+++ b/utils/src/main/java/com/google/apphosting/utils/config/YamlUtils.java
@@ -16,11 +16,22 @@
 
 package com.google.apphosting.utils.config;
 
+import static com.google.common.collect.ImmutableMap.toImmutableMap;
+
 import com.esotericsoftware.yamlbeans.YamlException;
 import com.esotericsoftware.yamlbeans.YamlReader;
-import java.util.HashMap;
+import com.google.common.base.Ascii;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.io.Reader;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 
 /**
@@ -68,54 +79,224 @@ static void validateUrl(String url) {
   }
 
   /**
-   * Parse the data into YAML.
+   * Parses YAML from the given {@link Reader} to produce an object of the given class.
+   *
+   * <p>This is a wrapper for YamlBeans that replaces its use of reflection. Recent versions require
+   * every property to have a field of the same name, which doesn't correspond to the way we use it
+   * here. So instead we build only on its basic YAML parsing support to get a Map of the YAML
+   * properties and their values (possibly consisting of nested Map and List values), and use
+   * reflection to call the appropriate setters ourselves.
+   *
+   * <p>This is not intended to be a general-purpose solution, but suffices for the types we need to
+   * build in this package.
    *
-   * @param data The text to parse as YAML. 
-   * @return The YAML data as a Map.
-   * @throws AppEngineConfigException Throws when the underlying Yaml library
-   * detects bad data of when the data does not parse to a Map.
+   * @return the parsed object, or null if there was nothing in {@code reader}. (Throwing an
+   *     exception might be better, but null is consistent with existing code.)
    */
-  @SuppressWarnings("unchecked")
-  public static Map<String, Object> genericParse(String data)
-      throws AppEngineConfigException {
+  static <T> T parse(Reader reader, Class<T> targetClass) throws YamlException {
+    YamlReader yamlReader = new YamlReader(reader);
+    @SuppressWarnings("unchecked")
+    Map<String, ?> map = (Map<String, ?>) yamlReader.read(Map.class);
+    if (map == null) {
+      return null;
+    }
     try {
-      YamlReader reader = new YamlReader(data);
-      return reader.read(Map.class);
-    } catch (YamlException exc) {
-      throw new AppEngineConfigException("Invalid YAML data: " + data, exc);
+      return targetClass.cast(decode(map, targetClass));
+    } catch (NumberFormatException | ClassCastException e) {
+      throw new YamlException(e.getMessage(), e);
     }
   }
 
   /**
-   * A utility class that encapsulates conversion between different
-   * types of objects.
+   * Decode part of the result we got back from {@link YamlReader#read()} into an object of the
+   * given type.
+   *
+   * <p>At the top level, we are trying to construct some Java object like {@link AppYaml} from
+   * YAML. We'll have got back a {@link Map} in which the keys are the top-level YAML fields and the
+   * corresponding values are what goes in those fields. We need to convert those values into the
+   * appropriate Java objects that can be stored in the fields of the target object ({@link
+   * AppYaml}).
+   *
+   * <p>Suppose the YAML looks like this:
+   *
+   * <pre>
+   * application: foo
+   * basic_scaling:
+   *   idle_timeout: 3
+   *   max_instances: 314
+   * </pre>
+   *
+   * <p>Then our goal is to construct an {@link AppYaml} and call its {@code link
+   * AppYaml#setApplication} and {@link AppYaml#setBasic_scaling} methods with the correct
+   * arguments. We know the types of those arguments because they are the parameter types of the
+   * setter methods. For {@code setApplication}, the parameter type is {@code String}. We already
+   * have a string from our {@code Map}, and we can simply pass that string to the method. For
+   * {@code setBasicScaling}, the parameter type is is {@link AppYaml.BasicScaling}. We'll need to
+   * construct a {@code BasicScaling} object recursively, and fill in its {@code idle_timeout} and
+   * {@code max_instances} fields.
+   *
+   * <p>Meanwhile the {@code Map} we get from {@link YamlReader#read()} looks essentially like this:
+   *
+   * <pre>
+   * Map.of(
+   *     "application", "foo",
+   *     "basic_scaling", Map.of(
+   *         "idle_timeout", "3",
+   *         "max_instances", "314"))
+   * </pre>
+   *
+   * <p>If the target type is a JavaBean, like {@link AppYaml} or {@link AppYaml.BasicScaling}, then
+   * the object we are decoding will be a map like the above. We need to construct an instance of
+   * the target type and fill in its properties using its setter methods. The values to be filled in
+   * are recursively decoded using this method.
+   *
+   * <p>If the target type is {@code String}, then we will already have a {@code String} in the map
+   * and we can just use it as-is.
+   *
+   * <p>If the target type is {@code int} or {@code double} or {@code boolean}, or their boxed
+   * wrapper types, then we will have a {@code String} which we will need to parse in the standard
+   * way.
+   *
+   * <p>If the target type is {@code List<T>} then we will have a {@code List} where each element
+   * needs to be recursively decoded into a {@code T}.
+   *
+   * <p>If the target type is {@code Map<K, V>} then we will have a {@code Map} where again the keys
+   * and values need to be recursively decoded into {@code K} and {@code V}.
    */
-  public static interface ObjectConverter<T> {
-    T convert(Object obj) throws Exception;
+  private static Object decode(Object encoded, Type targetType) throws YamlException {
+    if (targetType instanceof Class<?>) {
+      Class<?> targetClass = (Class<?>) targetType;
+      if (encoded instanceof Map) {
+        // This must be a JavaBean. If the target type is {@code Map<K, V>} then it is a
+        // ParameterizedType, not a Class.
+        @SuppressWarnings("unchecked")
+        Map<String, Object> map = (Map<String, Object>) encoded;
+        return decodeBean(map, targetClass);
+      }
+      if (targetClass.isEnum()) {
+        try {
+          @SuppressWarnings("unchecked")
+          Object result = Enum.valueOf((Class<Enum>) targetClass, (String) encoded);
+          return result;
+        } catch (IllegalArgumentException e) {
+          throw new YamlException(encoded + " is not a legal value of " + targetClass.getName(), e);
+        }
+      }
+      Function<String, Object> decoder = SIMPLE_DECODERS.get(targetClass);
+      if (decoder == null) {
+        if (encoded == null || encoded.equals("")) {
+          // We have something like this:
+          // foo:
+          // bar:
+          // This shows up as a map entry from "foo" to null or to "", depending on the YamlBeans
+          // version.
+          return decodeBean(ImmutableMap.of(), targetClass);
+        }
+        throw new YamlException(
+            "Don't know how to decode " + targetClass.getName() + " from <" + encoded + ">");
+      }
+      return decoder.apply((String) encoded);
+    } else if (targetType instanceof ParameterizedType) {
+      return decodeParameterized(encoded, (ParameterizedType) targetType);
+    } else {
+      throw new YamlException(
+          "Don't know how to decode " + targetType + " from " + encoded);
+    }
   }
 
-  /**
-   * Parses the data into YAML and converts the map values.
-   *
-   * @param data The text to parse as YAML. 
-   * @param converter A converter for updating the values of the Map from
-   * the type returned from the underlying Yaml library to the expected type.
-   * @return The YAML data as a Map.
-   * @throws AppEngineConfigException Throws when the underlying Yaml library
-   * detects bad data or when the data does not parse to a Map. Also all
-   * Exceptions from ObjectConverted are encapsulated in an
-   * AppEngineConfigException.
-   */
-  public static <T> Map<String, T> genericParse(String data, 
-      ObjectConverter<T> converter) throws AppEngineConfigException {
+  private static final ImmutableMap<Class<?>, Function<String, Object>> SIMPLE_DECODERS =
+      ImmutableMap.of(
+          Integer.class, Integer::decode,
+          int.class, Integer::decode,
+          Double.class, Double::parseDouble,
+          double.class, Double::parseDouble,
+          Boolean.class, YamlUtils::parseBoolean,
+          boolean.class, YamlUtils::parseBoolean,
+          String.class, x -> x);
+
+  private static <T> T decodeBean(Map<String, Object> map, Class<T> targetClass)
+      throws YamlException {
+    T object;
     try {
-      Map<String, T> yaml = new HashMap<String, T>();
-      for (Entry<String, Object> entry : genericParse(data).entrySet()) {
-        yaml.put(entry.getKey(), converter.convert(entry.getValue()));
+      object = targetClass.getConstructor().newInstance();
+    } catch (ReflectiveOperationException e) {
+      throw new YamlException("Can't construct " + targetClass.getName(), e);
+    }
+    // We have to find all the setters first, then invoke them in the order that the properties
+    // appear in `map`. Some things depend on earlier YAML entries being set before later ones.
+    ImmutableMap<String, Method> propertyToSetter =
+        Arrays.stream(targetClass.getMethods())
+            .filter(
+                m ->
+                    m.getName().startsWith("set")
+                        && m.getName().length() > 3
+                        && m.getParameterCount() == 1)
+            .collect(
+                toImmutableMap(
+                    m -> {
+                      String name = m.getName().substring(3);
+                      return Ascii.toLowerCase(name.charAt(0)) + name.substring(1);
+                    },
+                    m -> m));
+    for (Map.Entry<String, Object> entry : map.entrySet()) {
+      Method setter = propertyToSetter.get(entry.getKey());
+      if (setter == null) {
+        throw new YamlException(
+            "Unable to find property '" + entry.getKey() + "' in " + targetClass.getName());
+      }
+      Type parameterType = setter.getGenericParameterTypes()[0];
+      Object decodedArg;
+      try {
+        decodedArg = decode(entry.getValue(), parameterType);
+        setter.invoke(object, decodedArg);
+      } catch (ReflectiveOperationException | ClassCastException e) {
+        throw new YamlException(
+            "Error setting property '" + entry.getKey() + "' in " + targetClass.getName(), e);
+      }
+    }
+    return object;
+  }
+
+  private static Object decodeParameterized(Object encoded, ParameterizedType targetType)
+      throws YamlException {
+    if (targetType.getRawType().equals(List.class)) {
+      Type elementType = targetType.getActualTypeArguments()[0];
+      if (encoded == null || encoded.equals("")) {
+        encoded = ImmutableList.of();
       }
-      return yaml;
-    } catch (Exception exc) {
-      throw new AppEngineConfigException(exc);
+      return decodeList((Iterable<?>) encoded, elementType);
+    } else if (targetType.getRawType().equals(Map.class)) {
+      Type keyType = targetType.getActualTypeArguments()[0];
+      Type valueType = targetType.getActualTypeArguments()[1];
+      return decodeMap((Map<?, ?>) encoded, keyType, valueType);
+    } else {
+      throw new YamlException("Don't know how to decode " + targetType);
+    }
+  }
+
+  private static ImmutableList<?> decodeList(Iterable<?> encoded, Type elementType)
+      throws YamlException {
+    if (encoded == null) {
+      return ImmutableList.of();
+    }
+    ImmutableList.Builder<Object> list = ImmutableList.builder();
+    for (Object element : encoded) {
+      list.add(decode(element, elementType));
+    }
+    return list.build();
+  }
+
+  private static ImmutableMap<?, ?> decodeMap(Map<?, ?> encoded, Type keyType, Type valueType)
+      throws YamlException {
+    if (encoded == null) {
+      return ImmutableMap.of();
+    }
+    Map<Object, Object> map = new LinkedHashMap<>();
+    for (Map.Entry<?, ?> entry : encoded.entrySet()) {
+      Object key = decode(entry.getKey(), keyType);
+      Object value = decode(entry.getValue(), valueType);
+      map.put(key, value);
     }
+    return ImmutableMap.copyOf(map);
   }
 }