Merge "Trim trailing slash from REPOSITORY_BASE before add-apt-repository"