Add additional support for --or-show

Add --or-show for the following:
  * v2 roles
  * v2 projects

Change-Id: Ibbae19cda668575b9527fbd259f1298c48b8265b
Merge "Add additional support for --or-show"