sync with Hiroki's work

Changes are:

 - Uupdate to 3.6.1.
 - Enable geo-replication.  The previous version disabled it.
 - Use libargp in the tarball unconditionally.
 - Add DOCS option.