Merge "Fix pipeline to test cookiecutter generated salt models"