BZ986000 - DRL-to-RuleModel marshalling improvements
(cherry picked from commit f665a1cb63ef2d2ec33fc585bd62d8755a3a19ad)