BZ-986000 - DRL-to-RuleModel marshalling improvements