#382
Metadata delete service throws NumberFormatException if the uuid provided doesn't exist. Use a meaningful exception instead
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x