Merge "Update regexp for getting archived artifacts to upload to Artifactory"