Make new base-1.2.jar servlets available
Fix formatting to pass checkstyle checks