[PATCH 04/11] Clean up container disk set and encryption change handling. (#874714)