diff --git a/portal-impl/src/portal.properties b/portal-impl/src/portal.properties
index fc18e7cc8461f7ab0f9aaf9a8735e0cc6ab10f99..7765ce174bc374ffdfe3d832b8931b88db0cea70 100644
--- a/portal-impl/src/portal.properties
+++ b/portal-impl/src/portal.properties
@@ -9373,7 +9373,8 @@
     #
     # Always include the value specified in the property
     # "search.container.page.default.delta", since it is the default page size
-    # when no delta is specified. The absolute maximum allowed delta is 200.
+    # when no delta is specified. The absolute maximum allowed delta is
+    # specified in the property "search.container.page.max.delta".
     #
     # Env: LIFERAY_SEARCH_PERIOD_CONTAINER_PERIOD_PAGE_PERIOD_DELTA_PERIOD_VALUES
     #
@@ -9393,6 +9394,15 @@
     #
     search.container.page.iterator.max.pages=25
 
+    #
+    # Set the maximum allowed delta. See the proeprty
+    #
+    # "search.container.page.delta.values".
+    #
+    # Env: LIFERAY_SEARCH_PERIOD_CONTAINER_PERIOD_PAGE_PERIOD_MAX_PERIOD_DELTA
+    #
+    search.container.page.max.delta=200
+
     #
     # These properties are deprecated and will be removed in a future release.
     # They only affect the small number of searches still using legacy markup
@@ -10767,6 +10777,15 @@
     admin.email.password.changed.subject=com/liferay/portlet/admin/dependencies/email_password_changed_subject.tmpl
     admin.email.password.changed.body=com/liferay/portlet/admin/dependencies/email_password_changed_body.tmpl
 
+    #
+    # Env: LIFERAY_ADMIN_PERIOD_EMAIL_PERIOD_PASSWORD_PERIOD_LOCKOUT_PERIOD_BODY
+    # Env: LIFERAY_ADMIN_PERIOD_EMAIL_PERIOD_PASSWORD_PERIOD_LOCKOUT_PERIOD_SUBJECT
+    # Env: LIFERAY_ADMIN_PERIOD_EMAIL_PERIOD_PASSWORD_PERIOD_LOCKOUT_PERIOD_UNTIL_PERIOD_BODY
+    #
+    admin.email.password.lockout.subject=com/liferay/portlet/admin/dependencies/email_password_lockout_subject.tmpl
+    admin.email.password.lockout.body=com/liferay/portlet/admin/dependencies/email_password_lockout_body.tmpl
+    admin.email.password.lockout.until.body=com/liferay/portlet/admin/dependencies/email_password_lockout_until_body.tmpl
+
     #
     # Env: LIFERAY_ADMIN_PERIOD_EMAIL_PERIOD_PASSWORD_PERIOD_RESET_PERIOD_BODY
     # Env: LIFERAY_ADMIN_PERIOD_EMAIL_PERIOD_PASSWORD_PERIOD_RESET_PERIOD_SUBJECT