Sync with latest doctrine/common proxy factory cleanup and ZF2 2.1 as of issue #14