Some modification for ServiceLoaders because of a regression found while testing with java7 and jetty.