Index: main/features.c
===================================================================
--- main/features.c	(revision 385166)
+++ main/features.c	(working copy)
@@ -8269,6 +8269,7 @@
 /*! \internal \brief Clean up resources on Asterisk shutdown */
 static void features_shutdown(void)
 {
+	ast_cli_unregister_multiple(cli_features, ARRAY_LEN(cli_features));
 	ast_devstate_prov_del("Park");
 	ast_manager_unregister("Bridge");
 	ast_manager_unregister("Park");
@@ -8279,6 +8280,8 @@
 	ast_unregister_application(app_bridge);
 
 	pthread_cancel(parking_thread);
+	pthread_kill(parking_thread, SIGURG);
+	pthread_join(parking_thread, NULL);
 	ao2_ref(parkinglots, -1);
 }