Fix OMS-169 + fix for salt executor (OMS-169)