Feature/master/separate jetty7 service