"6.0-latest" tag is messed up with the "trunk" tag on docker images

"6.0-latest" tag is messed up with the "trunk" tag on docker images these days, doing a docker deploy with 6.0-latest gives me a broken services page when trying to deploy a new stack.

Doing a docker deploy with 6.0.4 gives me the right latest version. The "latest" tag in docker concepts should be the latest stable version AFAIK

Steps to reproduce:

1. Use container images on 6.0-latest
2. Navigate to services and try to create a service
3. Broken page
4. Use container images on 6.0.4 (should be the latest)
5. Navigate to services and try to create a service
6. Works