Fix bootstrapping of gitolite admin repo
Fixed merge conflicts.