Merge "Fixed the LP bug 993754. Ensure that the server created in the test is destroyed in finally: block of the test."