Final fix for import conflics and salt module flattening hack (OMS-507)