From b0987a7fbdd12b7fca70d804d0e3c03c04f55d11 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 21:40:49 +0200
Subject: [PATCH 01/18] Create u_timezone.rst

---
 source/upgrading/u_timezone.rst | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 source/upgrading/u_timezone.rst

diff --git a/source/upgrading/u_timezone.rst b/source/upgrading/u_timezone.rst
new file mode 100644
index 0000000000..44dbfed29a
--- /dev/null
+++ b/source/upgrading/u_timezone.rst
@@ -0,0 +1,33 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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
+   http://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.
+
+.. sub-section included in upgrade notes.
+
+Time zone requirements
+----------------------
+
+As of CloudStack 4.14,  you must explicitly configure time zone either in the MySQL server or JDBC driver (db.properties).
+In previous CloudStack versions, UTC time zone was assumed by default (all event's have UTC time stamps), so
+the same UTC time zone should now be explicitly configured.
+
+You can do this by editing the /etc/cloudstack/management/db.properties file and adding "serverTimezone=UTC"
+to the "db.cloud.url.params=" and "db.usage.url.params=" lines.  Example lines, from a clean 4.14 installation, are given below:
+
+.. parsed-literal::
+
+   db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&serverTimezone=UTC
+   db.usage.url.params=serverTimezone=UTC
+
+If you want time stamps in DB to use a different time zone, please make sure to test this thoroughly in test environment.

From 48b20a941086e68b7aea4dd9233987f469f925ad Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 21:44:05 +0200
Subject: [PATCH 02/18] Create _timezone.rst

---
 source/upgrading/upgrade/_timezone.rst | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 source/upgrading/upgrade/_timezone.rst

diff --git a/source/upgrading/upgrade/_timezone.rst b/source/upgrading/upgrade/_timezone.rst
new file mode 100644
index 0000000000..44dbfed29a
--- /dev/null
+++ b/source/upgrading/upgrade/_timezone.rst
@@ -0,0 +1,33 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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
+   http://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.
+
+.. sub-section included in upgrade notes.
+
+Time zone requirements
+----------------------
+
+As of CloudStack 4.14,  you must explicitly configure time zone either in the MySQL server or JDBC driver (db.properties).
+In previous CloudStack versions, UTC time zone was assumed by default (all event's have UTC time stamps), so
+the same UTC time zone should now be explicitly configured.
+
+You can do this by editing the /etc/cloudstack/management/db.properties file and adding "serverTimezone=UTC"
+to the "db.cloud.url.params=" and "db.usage.url.params=" lines.  Example lines, from a clean 4.14 installation, are given below:
+
+.. parsed-literal::
+
+   db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&serverTimezone=UTC
+   db.usage.url.params=serverTimezone=UTC
+
+If you want time stamps in DB to use a different time zone, please make sure to test this thoroughly in test environment.

From b44c16186e26b653c3ece3bfe9ca52b31aeabcc3 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 21:44:21 +0200
Subject: [PATCH 03/18] Delete u_timezone.rst

---
 source/upgrading/u_timezone.rst | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 source/upgrading/u_timezone.rst

diff --git a/source/upgrading/u_timezone.rst b/source/upgrading/u_timezone.rst
deleted file mode 100644
index 44dbfed29a..0000000000
--- a/source/upgrading/u_timezone.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-.. Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information#
-   regarding copyright ownership.  The ASF licenses this file
-   to you 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
-   http://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.
-
-.. sub-section included in upgrade notes.
-
-Time zone requirements
-----------------------
-
-As of CloudStack 4.14,  you must explicitly configure time zone either in the MySQL server or JDBC driver (db.properties).
-In previous CloudStack versions, UTC time zone was assumed by default (all event's have UTC time stamps), so
-the same UTC time zone should now be explicitly configured.
-
-You can do this by editing the /etc/cloudstack/management/db.properties file and adding "serverTimezone=UTC"
-to the "db.cloud.url.params=" and "db.usage.url.params=" lines.  Example lines, from a clean 4.14 installation, are given below:
-
-.. parsed-literal::
-
-   db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&serverTimezone=UTC
-   db.usage.url.params=serverTimezone=UTC
-
-If you want time stamps in DB to use a different time zone, please make sure to test this thoroughly in test environment.

From d5d0e011bee87547d67e90af6e147d6eb5145ac9 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 21:45:21 +0200
Subject: [PATCH 04/18] Update upgrade-4.13.rst

---
 source/upgrading/upgrade/upgrade-4.13.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.13.rst b/source/upgrading/upgrade/upgrade-4.13.rst
index 39135a77c5..63fa6bfc65 100644
--- a/source/upgrading/upgrade/upgrade-4.13.rst
+++ b/source/upgrading/upgrade/upgrade-4.13.rst
@@ -103,6 +103,8 @@ Backup current database
       $ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
 
 
+.. include:: _timezone.rst
+
 .. _ubuntu413:
 .. _apt-repo413:
 

From 13c161e5336c3611dc406bb3149b5b88d8302bd0 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 21:53:50 +0200
Subject: [PATCH 05/18] Update upgrade-4.13.rst

---
 source/upgrading/upgrade/upgrade-4.13.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/upgrading/upgrade/upgrade-4.13.rst b/source/upgrading/upgrade/upgrade-4.13.rst
index 63fa6bfc65..fbcce2b01d 100644
--- a/source/upgrading/upgrade/upgrade-4.13.rst
+++ b/source/upgrading/upgrade/upgrade-4.13.rst
@@ -103,14 +103,14 @@ Backup current database
       $ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
 
 
-.. include:: _timezone.rst
-
 .. _ubuntu413:
 .. _apt-repo413:
 
 Management Server
 -----------------
 
+.. include:: _timezone.rst
+
 Ubuntu
 ######
 

From 0c3a3c6183c6d6759eb2474ef33fa54dbc04b5c6 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 21:54:05 +0200
Subject: [PATCH 06/18] Update _timezone.rst

---
 source/upgrading/upgrade/_timezone.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/upgrading/upgrade/_timezone.rst b/source/upgrading/upgrade/_timezone.rst
index 44dbfed29a..4ec04d1fd8 100644
--- a/source/upgrading/upgrade/_timezone.rst
+++ b/source/upgrading/upgrade/_timezone.rst
@@ -16,7 +16,7 @@
 .. sub-section included in upgrade notes.
 
 Time zone requirements
-----------------------
+######################
 
 As of CloudStack 4.14,  you must explicitly configure time zone either in the MySQL server or JDBC driver (db.properties).
 In previous CloudStack versions, UTC time zone was assumed by default (all event's have UTC time stamps), so

From f56aecc435aafc8053e59af006e6d33eaf4e99bd Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:04:08 +0200
Subject: [PATCH 07/18] Update upgrade-4.12.rst

---
 source/upgrading/upgrade/upgrade-4.12.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.12.rst b/source/upgrading/upgrade/upgrade-4.12.rst
index 0ad46c7350..c7df5664a2 100644
--- a/source/upgrading/upgrade/upgrade-4.12.rst
+++ b/source/upgrading/upgrade/upgrade-4.12.rst
@@ -108,6 +108,8 @@ Backup current database
 Management Server
 -----------------
 
+.. include:: _timezone.rst
+
 Ubuntu
 ######
 

From ebb14d8f9f264e3261c706f43268d02e2b1c48bd Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:04:18 +0200
Subject: [PATCH 08/18] Update upgrade-4.11.rst

---
 source/upgrading/upgrade/upgrade-4.11.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.11.rst b/source/upgrading/upgrade/upgrade-4.11.rst
index 599cb54c42..a7d91e0e51 100644
--- a/source/upgrading/upgrade/upgrade-4.11.rst
+++ b/source/upgrading/upgrade/upgrade-4.11.rst
@@ -110,6 +110,8 @@ Backup current database
 Management Server
 -----------------
 
+.. include:: _timezone.rst
+
 Ubuntu
 ######
 

From a0707d15cec8b58118771eb2bbe7a6d44d0a4e0c Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:04:31 +0200
Subject: [PATCH 09/18] Update upgrade-4.10.rst

---
 source/upgrading/upgrade/upgrade-4.10.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.10.rst b/source/upgrading/upgrade/upgrade-4.10.rst
index 527f851378..a0070cd36f 100644
--- a/source/upgrading/upgrade/upgrade-4.10.rst
+++ b/source/upgrading/upgrade/upgrade-4.10.rst
@@ -114,6 +114,8 @@ Backup current database
 Management Server
 -----------------
 
+.. include:: _timezone.rst
+
 Ubuntu
 ######
 

From 60feeb4c90d640443cc8e34cc5aa4bf662ac0768 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:04:55 +0200
Subject: [PATCH 10/18] Update upgrade-4.9.rst

---
 source/upgrading/upgrade/upgrade-4.9.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.9.rst b/source/upgrading/upgrade/upgrade-4.9.rst
index 780a0d0884..13ae88fa1c 100644
--- a/source/upgrading/upgrade/upgrade-4.9.rst
+++ b/source/upgrading/upgrade/upgrade-4.9.rst
@@ -111,6 +111,8 @@ Backup current database
 Management Server
 -----------------
 
+.. include:: _timezone.rst
+
 Ubuntu
 ######
 

From c6804a888c86be8330dfd061fe5a6f19df1f2354 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:06:11 +0200
Subject: [PATCH 11/18] Update upgrade-4.8.rst

---
 source/upgrading/upgrade/upgrade-4.8.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.8.rst b/source/upgrading/upgrade/upgrade-4.8.rst
index 2400b5330d..64e05c45f9 100644
--- a/source/upgrading/upgrade/upgrade-4.8.rst
+++ b/source/upgrading/upgrade/upgrade-4.8.rst
@@ -98,6 +98,8 @@ Management Server on Ubuntu
 If you are using Ubuntu, follow this procedure to upgrade your packages. If 
 not, skip to step :ref:`rhel48`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and
@@ -167,6 +169,8 @@ Management Server on CentOS/RHEL
 If you are using CentOS or RHEL, follow this procedure to upgrade your 
 packages. If not, skip to hypervisors section :ref:`upg_hyp_48`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and

From fe1fa7b8e121142d002a2416cc4985200e4e1a74 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:06:37 +0200
Subject: [PATCH 12/18] Update upgrade-4.7.rst

---
 source/upgrading/upgrade/upgrade-4.7.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.7.rst b/source/upgrading/upgrade/upgrade-4.7.rst
index c1115f6990..6cec9d88d6 100644
--- a/source/upgrading/upgrade/upgrade-4.7.rst
+++ b/source/upgrading/upgrade/upgrade-4.7.rst
@@ -97,6 +97,8 @@ Management Server on Ubuntu
 If you are using Ubuntu, follow this procedure to upgrade your packages. If 
 not, skip to step :ref:`rhel47`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and
@@ -166,6 +168,8 @@ Management Server on CentOS/RHEL
 If you are using CentOS or RHEL, follow this procedure to upgrade your 
 packages. If not, skip to hypervisors section :ref:`upg_hyp_47`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and

From 45cf802653a22a01df453d5e618d1e99e861a645 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:07:01 +0200
Subject: [PATCH 13/18] Update upgrade-4.6.rst

---
 source/upgrading/upgrade/upgrade-4.6.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.6.rst b/source/upgrading/upgrade/upgrade-4.6.rst
index 1cb4d26b8a..eca297b99d 100644
--- a/source/upgrading/upgrade/upgrade-4.6.rst
+++ b/source/upgrading/upgrade/upgrade-4.6.rst
@@ -98,6 +98,8 @@ Management Server on Ubuntu
 If you are using Ubuntu, follow this procedure to upgrade your packages. If 
 not, skip to step :ref:`rhel46`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and
@@ -167,6 +169,8 @@ Management Server on CentOS/RHEL
 If you are using CentOS or RHEL, follow this procedure to upgrade your 
 packages. If not, skip to hypervisors section :ref:`upg_hyp_46`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and

From 435aa89795b5ea021f0282518106c10499a5b61b Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:07:20 +0200
Subject: [PATCH 14/18] Update upgrade-4.5.rst

---
 source/upgrading/upgrade/upgrade-4.5.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.5.rst b/source/upgrading/upgrade/upgrade-4.5.rst
index 92fc4b9d3f..da6102b15f 100644
--- a/source/upgrading/upgrade/upgrade-4.5.rst
+++ b/source/upgrading/upgrade/upgrade-4.5.rst
@@ -109,6 +109,8 @@ Management Server on Ubuntu
 If you are using Ubuntu, follow this procedure to upgrade your packages. If 
 not, skip to step :ref:`rhel45`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and
@@ -181,6 +183,8 @@ Management Server on CentOS/RHEL
 If you are using CentOS or RHEL, follow this procedure to upgrade your 
 packages. If not, skip to hypervisors section :ref:`upg_hyp_45`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and

From 630d34093aad8e5d7d43b595829e7b55c3c59271 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:07:40 +0200
Subject: [PATCH 15/18] Update upgrade-4.4.rst

---
 source/upgrading/upgrade/upgrade-4.4.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.4.rst b/source/upgrading/upgrade/upgrade-4.4.rst
index df1b2f71ae..0be2e863b3 100644
--- a/source/upgrading/upgrade/upgrade-4.4.rst
+++ b/source/upgrading/upgrade/upgrade-4.4.rst
@@ -100,6 +100,8 @@ Management Server on Ubuntu
 If you are using Ubuntu, follow this procedure to upgrade your packages. If 
 not, skip to step :ref:`rhel44`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and
@@ -169,6 +171,8 @@ Management Server on CentOS/RHEL
 If you are using CentOS or RHEL, follow this procedure to upgrade your 
 packages. If not, skip to hypervisors section :ref:`upg_hyp_44`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community
    supplied packages for CloudStack. If you've created your own packages and

From 1edc53356a8c7e774d684472a8f47ba18cf4caf0 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:08:17 +0200
Subject: [PATCH 16/18] Update upgrade-4.3.rst

---
 source/upgrading/upgrade/upgrade-4.3.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.3.rst b/source/upgrading/upgrade/upgrade-4.3.rst
index 08aa3d05c1..4c7e79afe1 100644
--- a/source/upgrading/upgrade/upgrade-4.3.rst
+++ b/source/upgrading/upgrade/upgrade-4.3.rst
@@ -100,6 +100,8 @@ Management Server on Ubuntu
 If you are using Ubuntu, follow this procedure to upgrade your packages. If 
 not, skip to step :ref:`rhel43`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community 
    supplied packages for CloudStack. If you've created your own packages and 
@@ -169,6 +171,8 @@ Management Server on CentOS/RHEL
 If you are using CentOS or RHEL, follow this procedure to upgrade your 
 packages. If not, skip to hypervisors section :ref:`upg_hyp_43`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community 
    supplied packages for CloudStack. If you've created your own packages and 

From a2f50211d92776d88048c00b8068b766c90a21d8 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Tue, 5 May 2020 22:08:33 +0200
Subject: [PATCH 17/18] Update upgrade-4.2.rst

---
 source/upgrading/upgrade/upgrade-4.2.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/upgrading/upgrade/upgrade-4.2.rst b/source/upgrading/upgrade/upgrade-4.2.rst
index 564e886e33..596245faef 100644
--- a/source/upgrading/upgrade/upgrade-4.2.rst
+++ b/source/upgrading/upgrade/upgrade-4.2.rst
@@ -96,6 +96,8 @@ Management Server Ubuntu
 If you are using Ubuntu, follow this procedure to upgrade your packages. If 
 not, skip to step :ref:`rhel42`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community 
    supplied packages for CloudStack. If you've created your own packages and 
@@ -164,6 +166,8 @@ Management Server CentOS/RHEL
 If you are using CentOS or RHEL, follow this procedure to upgrade your 
 packages. If not, skip to hypervisors section :ref:`upg_hyp_42`.
 
+.. include:: _timezone.rst
+
 .. note:: 
    **Community Packages:** This section assumes you're using the community 
    supplied packages for CloudStack. If you've created your own packages and 

From 92ede2cd57d5f2d51f20cde9c82a4c3b6094f773 Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Wed, 6 May 2020 13:14:05 +0200
Subject: [PATCH 18/18] Update _timezone.rst

---
 source/upgrading/upgrade/_timezone.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/upgrading/upgrade/_timezone.rst b/source/upgrading/upgrade/_timezone.rst
index 4ec04d1fd8..1c00863586 100644
--- a/source/upgrading/upgrade/_timezone.rst
+++ b/source/upgrading/upgrade/_timezone.rst
@@ -30,4 +30,3 @@ to the "db.cloud.url.params=" and "db.usage.url.params=" lines.  Example lines,
    db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&serverTimezone=UTC
    db.usage.url.params=serverTimezone=UTC
 
-If you want time stamps in DB to use a different time zone, please make sure to test this thoroughly in test environment.