Merge "Remove unimgr from distribution sanity test"