Fix repeat def of OS_BSD when sub-BSD flavor detected. Fix some make
tests that fail on non-2003 compile modes.
More stringent testing of OSX BSD like behavior. Fix BSD mis-detection
on OSX depending on include order.