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