Merge "Rework Outline API, remove isolatedZVolume remnants"