Merge "states: Split virtual_control_plane from maas"