Fold include/persistent.h into storage/storage_persistent.h now that it
clearly isn't going to be a much used public interface.