add two options, remove one options
add two options, remove one options

columbia/xtern,columbia/xtern,hemingcui/xtern_with_paxos,columbia/xtern,columbia/xtern,hemingcui/xtern_with_paxos,columbia/xtern,hemingcui/xtern_with_paxos,hemingcui/xtern_with_paxos,hemingcui/xtern_with_paxos,columbia/xtern