jl152: Local merge

jvmfwk/inc/jvmfwk/framework.h

@@ -69,14 +69,15 @@ extern "C" {
     The content of this file is an implementation detail and may change in the future.</dd>
 
     <dt>UNO_JAVA_JFW_INSTALL_DATA</dt>
-    <dd>The file contains settings for all users. A user cannot override these settings.
+    <dd><b>DEPRECATED. Support for this variable will soon be removed.</b><br>
+    The file contains settings for all users. A user cannot override these settings.
     When this parameter is provided then UNO_JAVA_JFW_SHARED_DATA and UNO_JAVA_JFW_USER_DATA
     are irrelevant. This parameter is intended for use during the setup. For example, to
     install extensions which contain java components. If there is already a file at this
     location then it will be overwritten if it is too old. The period of validatity is per
     default one hour. This value can be overridden by the bootstrap parameter
-    UNO_JAVA_JFW_INSTALL_EXPIRE. Setting this variable to 1000 means the settings file
-    is only valid for 1000 seconds.
+    UNO_JAVA_JFW_INSTALL_EXPIRE (<b>DEPRECATED</b>). Setting this variable to 1000 means
+    the settings file is only valid for 1000 seconds.
 
     <p>If one would not use UNO_JAVA_JFW_INSTALL_DATA during setup then most probably
     a user installation directory would be created in the home directory of root. This is