Merge "Add unimgr features to distribution sanity"