From: Daeho Jeong<daehojeong@xxxxxxxxxx>
As checkpoint=merge comes in, mount option setting related to checkpoint
had been mixed up and it became hard to understand. So, I separated
this option from "checkpoint=" and made another mount option
"checkpoint_merge" for this.
Signed-off-by: Daeho Jeong<daehojeong@xxxxxxxxxx>