Pull in r267961 and r267973 again. Fix for issues reported will follow.
Fix regression issue after r267961. Handle special string case for
SYSCTLs like previously.

MFC after:	2 weeks
Reported by:	several people