[carry 25344] deal with firewalld/docker startup issues Upstream-commit: 39b379cc632e9e2d7a6ace6e9aa7b40099945679 Component: engine