I have followed the same documentation and have even mentioned that in my original note.
Have you tried upgrading it again from cloudera console? I had similar issues and after removing the cluster node and upgrading, adding it back resolved the issue without deleting any data.
It worked pretty smooth.
Let me know how it goes.