Applying fixes as commented on doctrine/common#247
Applying fix for tests breaking in <5.4, adding 5.5 to build matrix
Merge pull request #248 from Ocramius/hotfix/doctrine/common#247-fixes

Hotfix/doctrine/common#247 fixes