Merge "repo.bash: replace with better version" into cm-10.1