Add destroy_server to javelin2

To make it easier to test and debug the create_server logic, add in the
destroy_server logic.

Change-Id: I97092a817db66b52b50eab26714e76c69e25e228
Merge "Add destroy_server to javelin2"