Update doc to reflect the bahavior change for filestore_merge_threshold setting.

Signed-off-by: Guang Yang (yguang@yahoo-inc.com)
Merge pull request #1783 from guangyy/folder-merge-doc

Update doc to reflect the bahavior change for filestore_merge_threshold setting.

Reviewed-by: Samuel Just <sam.just@inktank.com>