Merge remote-tracking branch 'upstream/master' into zope4py3

software/ors-amarisoft/buildout.hash.cfg

@@ -88,7 +88,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = f54bdbb308aee424b07ede8b551cfe5b
+md5sum = 8b9301f26fc4ffbc7eda9c1ac8da1a46
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg

software/ors-amarisoft/instance-enb.jinja2.cfg

@@ -171,7 +171,9 @@ inline =
 {%- if slapparameter_dict.get('xlog_fluentbit_forward_port') %}
       Port            ${:forward-port}
 {%- endif %}
+{%- if slapparameter_dict.get('xlog_fluentbit_forward_shared_key') %}
       Shared_Key      ${:forward-shared-key}
+{%- endif %}
       Self_Hostname   ${:forward-self-hostname}
       tls             on
       tls.verify      off