remove value buddies after setting sites to junction sites, not after populating junction sites
remove value buddies after setting sites to junction sites, not after populating junction sites

This mirrors how snapshots are captured and restored for branch events.
Also, switch back to resolving junction sites before capturing fork
snapshots so we capture the true state of each value immediately before
the branch.

lwahlmeier/avian,lostdj/avian,badlogic/avian,getlantern/avian,badlogic/avian,lostdj/avian,marcinolawski/avian,MaartenR/avian,badlogic/avian,MaartenR/avian,lwahlmeier/avian,marcinolawski/avian,getlantern/avian,joshuawarner32/avian,ucdseniordesign/avian,minor-jason/avian,MaartenR/avian,dicej/avian,bgould/avian,ucdseniordesign/avian,bgould/avian,dicej/avian,marcinolawski/avian,bigfatbrowncat/avian-pack.avian,bgould/avian,dicej/avian,getlantern/avian,bgould/avian,ucdseniordesign/avian,dicej/avian,ucdseniordesign/avian,joshuawarner32/avian,lostdj/avian,bigfatbrowncat/avian-pack.avian,marcinolawski/avian,MaartenR/avian,bigfatbrowncat/avian-pack.avian,bigfatbrowncat/avian-pack.avian,minor-jason/avian,lwahlmeier/avian,lwahlmeier/avian,badlogic/avian,minor-jason/avian,joshuawarner32/avian,lostdj/avian,joshuawarner32/avian,getlantern/avian,minor-jason/avian