Return 404 when delete non existing service

Change-Id: Ic46e125f5fd54fe87fa05a22d2cae3d45d299122
Merge "Return 404 when delete non existing service" into release-0.1