conflict fix and fix for https://github.com/soliantconsulting/zf-apigility-doctrine/commit/6ccb75ca8ce149161fa7fe0d1277c241ea7150c1#diff-e299d3445fb85c9879671beead1716e7R20