CSPACE-5928-REM: More changes to get build working with new Artifactory server running on the Nightly slice.