Merge branch 'use-camelcase' of git://github.com/neeckeloo/zf2 into h…

…otfix/3362

Conflicts:
	library/Zend/Http/Client/Cookies.php
	library/Zend/Http/Cookies.php
	library/Zend/Soap/Wsdl.php

src/Getopt.php

@@ -637,7 +637,7 @@ public function setAliases($aliasMap)
     /**
      * Define help messages for options.
      *
-     * The parameter $help_map is an associative array
+     * The parameter $helpMap is an associative array
      * mapping option name (short or long) to the help string.
      *
      * @param  array $helpMap