Merge branch 'master' into 'master'

Dmarc editing bug (missing checkbox) Fixes #4592

Closes #4592, #4529, and #4386

See merge request ispconfig/ispconfig3!754

Author: Till Brehm

interface/web/dns/templates/dns_dmarc_edit.htm

@@ -147,7 +147,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
             <div class="form-group">
                 <label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-3">
-                    {tmpl_var name='active'}
+                    <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} />
                 </div>
             </div>