When the Permissions plugin updates the permissions collection, it doesn't consult the userId() option

Results in, for example:

annotation.permissions = {
  read: [],
  admin: [6],
  delete: [6],
  update: [{key: 6, name: 'Somebody'}]
};

The fix is in Permissions.updateAnnotationPermissions(). Replace this:

annotation.permissions[type] = [@user]

With this:

annotation.permissions[type] = [@options.userId(@user)]
