Merge "Add shutdown-checkpoints to bugreport"