Switch to the simplified version of the patch for #1029110 that ended up being committed upstream (RT#7764).
- check more thorougly for errors when resolving KEYRING ccache names of type "persistent", which should only have a numeric UID as the next part of the name (#1029110)