CC-5038:
Silan error: list index out of range

cosmetic bug fix to prevent so much logging
CC-5038: Silan error: list index out of range

-fixed
Merge branch '2.3.x' into 2.3.x-saas