Merge branch 'stable-3.0'

* stable-3.0:
  Adapt to Project.NameKey refactoring
  ListUsersCommand: Fix NullPointerException when username is not set

Change-Id: I3230fa0a57005efc25e9d6f4adf92193dfaf19c9