So I first tried upgrading my test server with 3.6 and it failed twice from 3.5.2. Tried the workaround and didn’t work. I tried again to 3.6 and for some reason it work that time. Ugh.
I saw 3.6.1 was out and ran that in test just fine.
I then decided to run 3.6.1 on my prod server from 3.5.2 and I didn’t have any issues with the upgrade, took longer than usual but was successful.