Always use OEUndefinedCookie for keyboard cookies. And remove NSNotFound as a valid cookie.
Merge remote-tracking branch 'upstream/master'