Refactoring rsync_url according test failures

Change-Id: Ib815c322848024d6b0e945bf250988fe6d776fc5
6 files changed