[MERGE] Fix two bugs in api versioning support - 279447 and 279451

[Alexander Belchenko]

Robert Collins пишет:
> This tries to make the api support in bzr more suitable for bzr-svn.
> 
> -Rob
> 
In docstring:

+    :return None:

should be

	:return: None