The latter bug is fixed now. As for the former, lately it was really a
duplicate of the former; more than that, the query is quite generic and
can catch other issues not related to the original metadata connection
killed issue.
Change-Id: Ic2ea008bfdf406a03b1d0d7ef24337cdaa128199
Related-Bug: #1668958
Related-Bug: #1349617