Merge pull request #8074 from Qyriad/fixes/set-user-dir-properly UICommon: Properly set user dir if ./user is a file (not a directory)
