Merge pull request #4480 from TDT-AG/pr/20200929-xinetd-rearrange-params-in-tabs