- fixes #34248, #31310
- Remove optimizations for salt status check till flakyness of install is addressed
- fix indentation