Merge "Attempt to unlink session file if hardlink fails" into udc-dev