Fix for build break from servlets patch
Merge remote-tracking branch 'upstream/master'