=doc cleanup formatting error in docs
Merge pull request #1946 from akka/wip-doc-fix-patriknw

=doc cleanup formatting error in docs
=con Unbork genjavadoc for ReliableProxy

* genjavadoc fails with NPE for the ReliableProxy.DebugLogging trait,
  workaround by moving it to top level
Merge pull request #1947 from akka/wip-ReliableProxy-javadoc-patriknw

=con Unbork genjavadoc for ReliableProxy
Merge remote-tracking branch: upstream/master