BZ-986000 - DRL-to-RuleModel marshalling improvements

(cherry picked from commit 36653af7c53e26829f89d0a02230a72e6e4d0353)