Hi @stoll,
I am sorry that you have this issue and that you are having to fork the upgrade safe version of OpenZeppelin Contracts.
I have created an issue for this: https://github.com/OpenZeppelin/openzeppelin-contracts-ethereum-package/issues/102
There are plans to improve the upgrade safe fork of OpenZeppelin Contracts, see: The Future of contracts-ethereum-package