added simple stopthelineservlet to return basic response
merge conflicts