[CLC-1133] Fixes on bamboo failures