Merge "Revert "Revert "Refactored test salt formulas env pipeline"""