Merge "Add destroy_server to javelin2"