Revert "Made getServlet and getPortlet public (#10882)"
(accidentally merged from 7.1)

This reverts commit 179e672b5d3ce8c4c972dcfacbdbd39c5a08d6fa.

Change-Id: Ice2bdd949bd12000882c406af6ea6c0c6bcc145a
Revert "Removed legacy toString implementations as promised in 7.0
(#10916)" (accidentally merged from 7.1)

This reverts commit 5be248803b9b670cd4cf24d5173e7f580180545e.

Change-Id: If4371976f8afe68d08e814128e3256d66b8ecdb3
Null merge of reverted changes from 7.0 (commit 'd8412a30200a17497d60e1f4cf7e6a600d710d42')

Change-Id: Icaa49cce45bf237912cabf4803c4534e76edd70a