#4564 fix compiling
#4549 timeout was in millis not seconds :(
#4567 fix for web resource test
jamm jar with fixed manifest headers
Merge remote-tracking branch 'origin/master' into issue-3266-Make-New-WAR-Infrastructure