Upgrade to ZendFramework 2.1.4 and corresponding refactoring