Fix ZTS crashes with persistent resources in modules#13381

ndossche merged 2 commits intophp:masterphp/php-src:masterfrom

ndossche:zts-persistent-resources-againndossche/php-src:zts-persistent-resources-againCopy head branch name to clipboard