Merge "Refactor uriByProperties MCPArtifactory function"