Merge changes I05317ab8,Ic9569809

* changes:
  [workflow] Allow to customize artifactoryBaseUrl for artifacts
  [workflow] Allow to override jobs in flow