BZ-986000 - DRL-to-RuleModel marshalling improvements

(cherry picked from commit f3f41e08026a0d082616aece5ebc1b7407c44b53)