Resolve import dependency conflicts while keeping salt happy (OMS-507)