BZ-986000 - DRL-to-RuleModel marshalling improvements

(cherry picked from commit 2608bea33a1ad27a852eed3842392fba518887e0)