LPS-35004 & LPS-35005 Wiki portlet re-factoring & Wiki SMDH Tests