Sync From OSLO

blueprint: key-distribution-server
Change-Id: I424dbd6e8a535279498589444b976ea332e09c64
Merge "Sync From OSLO"