updated from master and fixed conflict in service-account.yaml

2 jobs for !155 with GONRG-5228-check-dockerignore in 20 minutes and 59 seconds (queued for 11 seconds)
latest merge request