fix showing ACL's for ls -Z (#487374), fix automated column width
        computation for it as well, fix couple of bugs (including #485715) in
        sort with determining end of fields (upstream), do not mistakenly
        display -g and -G runuser option in su --help output, some sed cleanup
        in spec