tidied imports
added fix for the ProxyServlet when running on a PaaS like OpenShift - many thanks @iocanel for the heads up! :)