Merge "docker: make sure to cleanup containers before force exit" into stable-2.16