Fix for LPS-36610 and LPS-37319 in master

Hi Zsolt,

These two commits fix the issues in both LPS-36610 and  LPS-37319 in **master**
The assumption is that when wiki page is selected from the list
 * WIKI ADMIN portlet will display the history tab
 * other WIKI portlets will display the standard view