Merge pdxcat/xinetd with upstream

 - Fix rebase errors