BZ-986000 - DRL-to-RuleModel marshalling improvements

(cherry picked from commit fcdab1036e04a622e376f6416714e5c8111464dc)