Issue 562: Renamed RestContext.userId to RestContext.username