Changes for proper server operation on RHEL bases.  These should not neg...

...atively impact behavior on Ubuntu bases.
this looks like a merge error