Automatic merge from submit-queue (batch tested with PRs 37366, 36373)

extend cmd valid resources information about roles