[TIMOB-15499] Fixed CLI packaging issue 3.1.X backport