Fixing branch assumptions

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
Merge pull request #154 from ceph/wip_fix_multi_version

Fixing branch assumptions