Merge "Fix idempotency issues that could cause install/configuration failures"