Clean up service descriptions

Change-Id: Ie03ed62c901bb6c18e392356547fb7cfe3a23191
mongodb proxy fast shutdown

Change-Id: I5ce7ef2bb658f98ba05f09066fe049d28d159a8d
Merge "Clean up service descriptions"
Merge "mongodb proxy fast shutdown"