CRM-1659: Implement DoctrineExtensions for Oro - fixed php 5.3 incompatible test
Merge remote-tracking branch 'upstream/master'