Merge branch 'master' into 2449-keep-write-blocks

diff --cc services/keep/keep.go
index c4e1705d08dd6e20b221f9d2e1b877dba483fb4a,3adffcf846e3dcd2464adccbd3d94ed1feb057f3..9c448269e167416c82ffc6ae46467b65b2a5ce8f
--- 1/services/keep/keep.go
--- 2/services/keep/keep.go
+++ b/services/keep/keep.go
@@@ -5,9 -5,9 +5,10 @@@ import 
        "bytes"
        "crypto/md5"
        "errors"
+       "flag"
        "fmt"
        "github.com/gorilla/mux"
 +      "io"
        "io/ioutil"
        "log"
        "net/http"