Reorganize vagrant roles commands

Change-Id: I152b18ec188e1db07861980559150f0adf45dc1d
Merge "Reorganize vagrant roles commands"