NIHVIVO-3264 avoid deprecation warnings; new URLEncoder convenience class

webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploaderThumbnailerTester_2.java

@@ -49,6 +49,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploaderThumb
  * The goal here is to see whether differences in crop dimensions might cause
  * one or more black edges on the thumbnails.
  */
+@SuppressWarnings("deprecation")
 public class ImageUploaderThumbnailerTester_2 extends Frame {
 	private static final Log log = LogFactory
 			.getLog(ImageUploaderThumbnailerTester_2.class);

webapp/test/stubs/javax/servlet/http/HttpSessionStub.java

@@ -113,6 +113,7 @@ public class HttpSessionStub implements HttpSession {
 				"HttpSessionStub.getMaxInactiveInterval() not implemented.");
 	}
 
+	@Deprecated
 	@Override
 	public javax.servlet.http.HttpSessionContext getSessionContext() {
 		throw new RuntimeException(