Merge branch 'libs/servlet-api/local'