BZ-986000 - DRL-to-RuleModel marshalling improvements
(cherry picked from commit e3b6ee4dd4adb47c6b95fb6894689f7834963f7b)
[BZ-986000] consider imports when determining the type of a field
(cherry picked from commit eee9b45de9790e0a13b760cd32d4a9739e219886)