Push out the latest changes that gets attachments and journals to
migrate properly and cleans up some of the other code.