Merge "Fix share manage tempest test cleanup"