Add downstream changes.

[williamtheaker]

I was bringing upstream into our internal repo and thought I'd submit these pretty minor changes. Adds unified_mode, switches OS lookups to native methods, removes deprecated keys. That kind of stuff.