I was diffing libraries Address and Context and their Upgradeable counterparts and see no differences that would cause problems on upgrading the child contract.
What is the purpose of Address->AddressUpgradeable, Context->ContextUpgradeable, SafeMath->SafeMathUpgradeable?