Merge remote-tracking branch 'jfrog/master' into maven-plugin
Merge branch 'maven-plugin'