bzr segment: Handle repos with shelves correctly

Return None instead of a string with spaces for a clean repo with
shelves.
Merge branch 'fix-bzr-shelves' into develop