Added first test ignore for Glassfish 3.x
Disabled testSubstitutionWithExtraQueryParams() in Wildfly due to WFLY-2284
Merge remote-tracking branch 'upstream/master'