move job timeout note into General Upgrade Notes. fix merge

source/upgrade/upgrade_notes.rst

diff --git a/source/upgrade/upgrade_notes.rst b/source/upgrade/upgrade_notes.rst
index d2aad91..99fad0b 100644
--- a/source/upgrade/upgrade_notes.rst
+++ b/source/upgrade/upgrade_notes.rst
@@ -17,6 +17,19 @@
 General Upgrade Notes
 =====================
 
+
+Job timeouts are shorter than before
+------------------------------------
+
+Please be aware that in 4.5 a bug is fixed
+(`CLOUDSTACK-7595 <https://issues.apache.org/jira/browse/CLOUDSTACK-7595>`_)
+that makes sure global settings 'job.cancel.threshold.minutes' and
+'job.expire.minutes' are defined in minutes as they are supposed to be. Before,
+they were accidentally 60x bigger than configured. This means previous versions
+had a much higher timeout. You might hit this timeout when migrating large disks
+or making big snapshots, etc.
+
+
 Java version upgraded to Java 1.7
 ---------------------------------