Merge "Fix artifactory snapshots"