Merge "Revert "Revert "Changed base docker image for salt models testing"""