Fix User ID in Context and Notifications

    Notifications should contain the User ID not the User Name
    This change replaces the deprecated X-User header with
    X-User-Id.  In most cases, the User ID is preferred over the
    name.

Fixes: Bug 1235145
Change-Id: I3cce6b35fc40f4ff4cc45b04714067956fb1864c
Merge "Fix User ID in Context and Notifications"