Portlet-tests: JBDS 5 and 6 compatibility fix