fixes
Merge remote-tracking branch 'remotes/bluesoft-rnd/RELEASE-2.1' into RELEASE-2.1-JSP
userId param handling & preparation for search expression
search fix
Merge remote-tracking branch 'remotes/bluesoft-rnd/RELEASE-2.1' into RELEASE-2.1-JSP