proposed changes for blacklight-jetty compatibility