Merge in some changes between release and local CVS version of

my patch Brian applied:
- check for nogroup beside nobody, too.
- correct space/tabs in sed patterns
- cleanup indentation
- cleanup ordering of subst vars


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81570 13f79535-47bb-0310-9956-ffa450edef68