Merge "Disambiguate apps that share uid for job/bucket purposes"