Branch b1_6

b=16455
i=brian
i=adilger

The libcfs macros can be defined as stubs in lnet. I used
m4_ifdef() for LC_CONFIG_SPLIT to localize the change to
a single branch.