WH-35 - Compatibility update to Zend 2.2.1