Ensure our DevStack plugin cleans up services it starts

Change-Id: I6cad863c85d2fc612a972b778de606d250d927cb
Merge "Ensure our DevStack plugin cleans up services it starts"