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