Merge "Don't reference OSA repo in repolist"