Forward port zendframework/zendframework#3522

Conflicts:
	library/Zend/Code/Generator/AbstractMemberGenerator.php
	library/Zend/Mvc/Controller/AbstractRestfulController.php
	library/Zend/Soap/Client/DotNet.php

src/Reader/Collection/Author.php

@@ -26,5 +26,4 @@ public function getValues()
         }
         return array_unique($authors);
     }
-
 }

src/Reader/Collection/Category.php

@@ -32,5 +32,4 @@ public function getValues()
         }
         return array_unique($categories);
     }
-
 }

src/Reader/Feed/Atom/Source.php

@@ -91,5 +91,4 @@ public function valid() {}
      * @return void
      */
     protected function indexEntries() {}
-
 }

src/Reader/FeedSet.php

@@ -124,5 +124,4 @@ public function offsetGet($offset)
         }
         return parent::offsetGet($offset);
     }
-
 }

src/Writer/Deleted.php

@@ -234,5 +234,4 @@ public function getComment()
         }
         return $this->data['comment'];
     }
-
 }

src/Writer/Feed.php

@@ -238,5 +238,4 @@ public function export($type, $ignoreExceptions = false)
         }
         return $renderer->render()->saveXml();
     }
-
 }

src/Writer/Renderer/Entry/Atom/Deleted.php

@@ -99,5 +99,4 @@ protected function _setBy(DOMDocument $dom, DOMElement $root)
             $uri->appendChild($text);
         }
     }
-
 }

src/Writer/Renderer/Entry/AtomDeleted.php

@@ -101,5 +101,4 @@ protected function _setBy(DOMDocument $dom, DOMElement $root)
             $uri->appendChild($text);
         }
     }
-
 }

src/Writer/Renderer/Feed/Atom.php

@@ -93,5 +93,4 @@ public function render()
         }
         return $this;
     }
-
 }

src/Writer/Renderer/Feed/Atom/Source.php

@@ -88,5 +88,4 @@ protected function _setGenerator(DOMDocument $dom, DOMElement $root)
             $generator->setAttribute('version', $gdata['version']);
         }
     }
-
 }

src/Writer/Renderer/Feed/AtomSource.php

@@ -92,5 +92,4 @@ protected function _setGenerator(DOMDocument $dom, DOMElement $root)
             $generator->setAttribute('version', $gdata['version']);
         }
     }
-
 }