b=15969

Instead of fighting with a special case of having libcfs only exist on HEAD, I
created an empty branch for b1_x in libcfs.