The package_manager code rearranging had some issues with module imports that
were now missing. Fix all the ones I could spot from quick inspection.
(From OE-Core rev: 287eccd7af7d97604ca68d456c23655fd1b6c40b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>