contents: Merge /usr/sbin into /usr/bin

It's easier than changing the path globally, and why not?  It's a
logical continuation of the /usr merge.