Updates to make custom Artifactory user ID more reliable.