PRD-4725, CM-466: Apply workaround for ivy-publish bug - second try after the first one fell short.
Merge branch 'PRD-4725' into PRD-5.0-obesity