Merge "Fix INF-354 repeat delete same subscription should return 404"