Merge "Add artifactory repository to store fixes"