Convert grant_type to be a multiple choice
#4200
Merged
grant_type to be a multiple choice
#4200