Thanks Ian, I was having the same problems and found this thread. Copied over the files into the new admin directory, copied all the other files over and overwrote
Went to the shop admin page
Scrolled down to the "upgrade" section, was prompted to upgrade and all ran flawlessly
(6.1.1 - 6.1.5)