BZ-986000 - DRL-to-RuleModel marshalling improvements

(cherry picked from commit a3caa44617409b1f2e7807ef36bd74c3bbb27916)