Merge "Remove servlet-api from WAR/lib"