Re-order oauth commands and sync with keystoneclient

1) split out token and consumer
2) sync parameters with keystoneclient

Change-Id: I2d529f0f9087f9939101e963af3d801497fc1171
Merge "Re-order oauth commands and sync with keystoneclient"