[gatein-pull-requests] [gatein/gatein-wsrp] f40325: - Merged changes from upstream