fixes for {sbin,bin} -> /usr/{sbin,bin} move