Updating for 6.0.2

Getting rid of old mount/companion methods. Adding usage of the new
C_MountJournal methods.