merge from tridge

diff --cc common/ctdb_control.c
Simple merge

diff --cc include/ctdb_private.h
index 411496a03bea2f12dc0f5663afc347f13a1d9826,4ef931234451b6e3188ef5cb1740bde4f7a3832a..a9bef8852e70c45d91626cd2079274791cc39bd2
--- 1/include/ctdb_private.h
--- 2/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@@ -282,7 -285,9 +285,10 @@@ enum ctdb_controls {CTDB_CONTROL_PROCES
                    CTDB_CONTROL_TRAVERSE_DATA,
                    CTDB_CONTROL_REGISTER_SRVID,
                    CTDB_CONTROL_DEREGISTER_SRVID,
 +                  CTDB_CONTROL_GET_DBNAME,
+                   CTDB_CONTROL_ENABLE_SEQNUM,
+                   CTDB_CONTROL_UPDATE_SEQNUM,
+                   CTDB_CONTROL_SET_SEQNUM_FREQUENCY,
  };