Comment 24 for bug 858122

Update: I found that the root cause of my X11 not starting was due to my nvidia-current package being in a bad state during the upgrade. The video drivers were not installed for the new kernel, which was causing the second issue.

After manually doing the move & symlink of /var/run and /var/lock, everything seems to be in working order now. I didn't end up messing with the ordering of scripts in runlevel 6 at all.