appservice - fix tests for 4.0 and make docker_image_name handling consistent for 4.0
#7424
| Job | Run time |
|---|---|
| 2s | |
| 3s | |
| 3s | |
| 3m 44s | |
| 3m 52s |