retab role/gitblit to spaces

Change-Id: I46472b93fdcc880f4dc871c461d647d460a5311e
Merge "retab role/gitblit to spaces" into production