[gatein-dev] About to merge wsrp2-integration branch to trunk again.