Merge "Add to _param artifactory endpoint parameter" into release/2018.4.0