BZ 986000 Refactoring caused by DRL-to-RuleModel marshalling improvements