Fix of GTNPORTAL-3182
Merge branch 'master' of https://github.com/akovari/gatein-portal