BZ-DRL-to-RuleModel marshalling improvements

(cherry picked from commit 5dcf4be70924742a79e40caf522e1de80a22670c)
BZ-986000 - DRL-to-RuleModel marshalling improvements

(cherry picked from commit 887139648d2e693bb50f286810231150bf1fba9f)