Removing Jwe/Jws factories for now as filters already support the injection of custom Jwe/Jws handlers
Updating java2wadl to support new wadl generator properties
Recording .gitmergeinfo Changes