Merge changes I4d3e36d2,I675bb777

* changes:
  Add new system class for artifactory
  remove hardcoded parameter for artifactory docker image