Use consistent KDS imports across the whole Kolibri

Use consistent KDS imports across the whole Kolibri #3856