Made the conflict resolving diskmgr use int64_t for disk block numbers instead of int.
Merge branch 'sam_detemplatize_conflict_resolver' into sam_1170