[gatein-dev] Branch GTNPORTAL-1493 merged into trunk