Merge "Changed base docker image for salt models testing"