diff --git a/Gopkg.lock b/Gopkg.lock
index 84f3f5721..57324082d 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -317,8 +317,8 @@
   name = "go.etcd.io/bbolt"
   packages = ["."]
   pruneopts = "UT"
-  revision = "583e8937c61f1af6513608ccc75c97b6abdf4ff9"
-  version = "v1.3.0"
+  revision = "acbc2c426a444a65e0cbfdcbb3573857bf18b465"
+  version = "v1.3.1-etcd.7"
 
 [[projects]]
   digest = "1:3c1a69cdae3501bf75e76d0d86dc6f2b0a7421bc205c0cb7b96b19eed464a34d"
diff --git a/vendor/github.com/coreos/bbolt/LICENSE b/vendor/go.etcd.io/bbolt/LICENSE
similarity index 100%
rename from vendor/github.com/coreos/bbolt/LICENSE
rename to vendor/go.etcd.io/bbolt/LICENSE
diff --git a/vendor/github.com/coreos/bbolt/bolt_386.go b/vendor/go.etcd.io/bbolt/bolt_386.go
similarity index 95%
rename from vendor/github.com/coreos/bbolt/bolt_386.go
rename to vendor/go.etcd.io/bbolt/bolt_386.go
index 820d533c1..4d35ee7cf 100644
--- a/vendor/github.com/coreos/bbolt/bolt_386.go
+++ b/vendor/go.etcd.io/bbolt/bolt_386.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 // maxMapSize represents the largest mmap size supported by Bolt.
 const maxMapSize = 0x7FFFFFFF // 2GB
diff --git a/vendor/github.com/coreos/bbolt/bolt_amd64.go b/vendor/go.etcd.io/bbolt/bolt_amd64.go
similarity index 95%
rename from vendor/github.com/coreos/bbolt/bolt_amd64.go
rename to vendor/go.etcd.io/bbolt/bolt_amd64.go
index 98fafdb47..60a52dad5 100644
--- a/vendor/github.com/coreos/bbolt/bolt_amd64.go
+++ b/vendor/go.etcd.io/bbolt/bolt_amd64.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 // maxMapSize represents the largest mmap size supported by Bolt.
 const maxMapSize = 0xFFFFFFFFFFFF // 256TB
diff --git a/vendor/github.com/coreos/bbolt/bolt_arm.go b/vendor/go.etcd.io/bbolt/bolt_arm.go
similarity index 98%
rename from vendor/github.com/coreos/bbolt/bolt_arm.go
rename to vendor/go.etcd.io/bbolt/bolt_arm.go
index 7e5cb4b94..105d27ddb 100644
--- a/vendor/github.com/coreos/bbolt/bolt_arm.go
+++ b/vendor/go.etcd.io/bbolt/bolt_arm.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import "unsafe"
 
diff --git a/vendor/github.com/coreos/bbolt/bolt_arm64.go b/vendor/go.etcd.io/bbolt/bolt_arm64.go
similarity index 95%
rename from vendor/github.com/coreos/bbolt/bolt_arm64.go
rename to vendor/go.etcd.io/bbolt/bolt_arm64.go
index b26d84f91..f5aa2a5ee 100644
--- a/vendor/github.com/coreos/bbolt/bolt_arm64.go
+++ b/vendor/go.etcd.io/bbolt/bolt_arm64.go
@@ -1,6 +1,6 @@
 // +build arm64
 
-package bolt
+package bbolt
 
 // maxMapSize represents the largest mmap size supported by Bolt.
 const maxMapSize = 0xFFFFFFFFFFFF // 256TB
diff --git a/vendor/github.com/coreos/bbolt/bolt_linux.go b/vendor/go.etcd.io/bbolt/bolt_linux.go
similarity index 91%
rename from vendor/github.com/coreos/bbolt/bolt_linux.go
rename to vendor/go.etcd.io/bbolt/bolt_linux.go
index 2b6766614..7707bcacf 100644
--- a/vendor/github.com/coreos/bbolt/bolt_linux.go
+++ b/vendor/go.etcd.io/bbolt/bolt_linux.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"syscall"
diff --git a/vendor/github.com/coreos/bbolt/bolt_mips64x.go b/vendor/go.etcd.io/bbolt/bolt_mips64x.go
similarity index 95%
rename from vendor/github.com/coreos/bbolt/bolt_mips64x.go
rename to vendor/go.etcd.io/bbolt/bolt_mips64x.go
index 134b578bd..baeb289fd 100644
--- a/vendor/github.com/coreos/bbolt/bolt_mips64x.go
+++ b/vendor/go.etcd.io/bbolt/bolt_mips64x.go
@@ -1,6 +1,6 @@
 // +build mips64 mips64le
 
-package bolt
+package bbolt
 
 // maxMapSize represents the largest mmap size supported by Bolt.
 const maxMapSize = 0x8000000000 // 512GB
diff --git a/vendor/github.com/coreos/bbolt/bolt_mipsx.go b/vendor/go.etcd.io/bbolt/bolt_mipsx.go
similarity index 95%
rename from vendor/github.com/coreos/bbolt/bolt_mipsx.go
rename to vendor/go.etcd.io/bbolt/bolt_mipsx.go
index d5ecb0597..2d9b1a91f 100644
--- a/vendor/github.com/coreos/bbolt/bolt_mipsx.go
+++ b/vendor/go.etcd.io/bbolt/bolt_mipsx.go
@@ -1,6 +1,6 @@
 // +build mips mipsle
 
-package bolt
+package bbolt
 
 // maxMapSize represents the largest mmap size supported by Bolt.
 const maxMapSize = 0x40000000 // 1GB
diff --git a/vendor/github.com/coreos/bbolt/bolt_openbsd.go b/vendor/go.etcd.io/bbolt/bolt_openbsd.go
similarity index 97%
rename from vendor/github.com/coreos/bbolt/bolt_openbsd.go
rename to vendor/go.etcd.io/bbolt/bolt_openbsd.go
index 7058c3d73..d7f50358e 100644
--- a/vendor/github.com/coreos/bbolt/bolt_openbsd.go
+++ b/vendor/go.etcd.io/bbolt/bolt_openbsd.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"syscall"
diff --git a/vendor/github.com/coreos/bbolt/bolt_ppc.go b/vendor/go.etcd.io/bbolt/bolt_ppc.go
similarity index 69%
rename from vendor/github.com/coreos/bbolt/bolt_ppc.go
rename to vendor/go.etcd.io/bbolt/bolt_ppc.go
index 645ddc3ed..69804714a 100644
--- a/vendor/github.com/coreos/bbolt/bolt_ppc.go
+++ b/vendor/go.etcd.io/bbolt/bolt_ppc.go
@@ -1,9 +1,12 @@
 // +build ppc
 
-package bolt
+package bbolt
 
 // maxMapSize represents the largest mmap size supported by Bolt.
 const maxMapSize = 0x7FFFFFFF // 2GB
 
 // maxAllocSize is the size used when creating array pointers.
 const maxAllocSize = 0xFFFFFFF
+
+// Are unaligned load/stores broken on this arch?
+var brokenUnaligned = false
diff --git a/vendor/github.com/coreos/bbolt/bolt_ppc64.go b/vendor/go.etcd.io/bbolt/bolt_ppc64.go
similarity index 95%
rename from vendor/github.com/coreos/bbolt/bolt_ppc64.go
rename to vendor/go.etcd.io/bbolt/bolt_ppc64.go
index 9331d9771..356590857 100644
--- a/vendor/github.com/coreos/bbolt/bolt_ppc64.go
+++ b/vendor/go.etcd.io/bbolt/bolt_ppc64.go
@@ -1,6 +1,6 @@
 // +build ppc64
 
-package bolt
+package bbolt
 
 // maxMapSize represents the largest mmap size supported by Bolt.
 const maxMapSize = 0xFFFFFFFFFFFF // 256TB
diff --git a/vendor/github.com/coreos/bbolt/bolt_ppc64le.go b/vendor/go.etcd.io/bbolt/bolt_ppc64le.go
similarity index 95%
rename from vendor/github.com/coreos/bbolt/bolt_ppc64le.go
rename to vendor/go.etcd.io/bbolt/bolt_ppc64le.go
index 8c143bc5d..422c7c69d 100644
--- a/vendor/github.com/coreos/bbolt/bolt_ppc64le.go
+++ b/vendor/go.etcd.io/bbolt/bolt_ppc64le.go
@@ -1,6 +1,6 @@
 // +build ppc64le
 
-package bolt
+package bbolt
 
 // maxMapSize represents the largest mmap size supported by Bolt.
 const maxMapSize = 0xFFFFFFFFFFFF // 256TB
diff --git a/vendor/github.com/coreos/bbolt/bolt_s390x.go b/vendor/go.etcd.io/bbolt/bolt_s390x.go
similarity index 95%
rename from vendor/github.com/coreos/bbolt/bolt_s390x.go
rename to vendor/go.etcd.io/bbolt/bolt_s390x.go
index d7c39af92..6d3fcb825 100644
--- a/vendor/github.com/coreos/bbolt/bolt_s390x.go
+++ b/vendor/go.etcd.io/bbolt/bolt_s390x.go
@@ -1,6 +1,6 @@
 // +build s390x
 
-package bolt
+package bbolt
 
 // maxMapSize represents the largest mmap size supported by Bolt.
 const maxMapSize = 0xFFFFFFFFFFFF // 256TB
diff --git a/vendor/github.com/coreos/bbolt/bolt_unix.go b/vendor/go.etcd.io/bbolt/bolt_unix.go
similarity index 92%
rename from vendor/github.com/coreos/bbolt/bolt_unix.go
rename to vendor/go.etcd.io/bbolt/bolt_unix.go
index 06592a080..38e11d4c4 100644
--- a/vendor/github.com/coreos/bbolt/bolt_unix.go
+++ b/vendor/go.etcd.io/bbolt/bolt_unix.go
@@ -1,6 +1,6 @@
 // +build !windows,!plan9,!solaris
 
-package bolt
+package bbolt
 
 import (
 	"fmt"
@@ -56,7 +56,9 @@ func mmap(db *DB, sz int) error {
 	}
 
 	// Advise the kernel that the mmap is accessed randomly.
-	if err := madvise(b, syscall.MADV_RANDOM); err != nil {
+	err = madvise(b, syscall.MADV_RANDOM)
+	if err != nil && err != syscall.ENOSYS {
+		// Ignore not implemented error in kernel because it still works.
 		return fmt.Errorf("madvise: %s", err)
 	}
 
diff --git a/vendor/github.com/coreos/bbolt/bolt_unix_solaris.go b/vendor/go.etcd.io/bbolt/bolt_unix_solaris.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/bolt_unix_solaris.go
rename to vendor/go.etcd.io/bbolt/bolt_unix_solaris.go
index fd8335ecc..492eaf302 100644
--- a/vendor/github.com/coreos/bbolt/bolt_unix_solaris.go
+++ b/vendor/go.etcd.io/bbolt/bolt_unix_solaris.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"fmt"
diff --git a/vendor/github.com/coreos/bbolt/bolt_windows.go b/vendor/go.etcd.io/bbolt/bolt_windows.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/bolt_windows.go
rename to vendor/go.etcd.io/bbolt/bolt_windows.go
index ca6f9a11c..4e3f90fb4 100644
--- a/vendor/github.com/coreos/bbolt/bolt_windows.go
+++ b/vendor/go.etcd.io/bbolt/bolt_windows.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"fmt"
diff --git a/vendor/github.com/coreos/bbolt/boltsync_unix.go b/vendor/go.etcd.io/bbolt/boltsync_unix.go
similarity index 91%
rename from vendor/github.com/coreos/bbolt/boltsync_unix.go
rename to vendor/go.etcd.io/bbolt/boltsync_unix.go
index f50442523..9587afefe 100644
--- a/vendor/github.com/coreos/bbolt/boltsync_unix.go
+++ b/vendor/go.etcd.io/bbolt/boltsync_unix.go
@@ -1,6 +1,6 @@
 // +build !windows,!plan9,!linux,!openbsd
 
-package bolt
+package bbolt
 
 // fdatasync flushes written data to a file descriptor.
 func fdatasync(db *DB) error {
diff --git a/vendor/github.com/coreos/bbolt/bucket.go b/vendor/go.etcd.io/bbolt/bucket.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/bucket.go
rename to vendor/go.etcd.io/bbolt/bucket.go
index 44db88b8a..84bfd4d6a 100644
--- a/vendor/github.com/coreos/bbolt/bucket.go
+++ b/vendor/go.etcd.io/bbolt/bucket.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"bytes"
diff --git a/vendor/github.com/coreos/bbolt/cursor.go b/vendor/go.etcd.io/bbolt/cursor.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/cursor.go
rename to vendor/go.etcd.io/bbolt/cursor.go
index 1be9f35e3..3000aced6 100644
--- a/vendor/github.com/coreos/bbolt/cursor.go
+++ b/vendor/go.etcd.io/bbolt/cursor.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"bytes"
@@ -157,12 +157,6 @@ func (c *Cursor) seek(seek []byte) (key []byte, value []byte, flags uint32) {
 	// Start from root page/node and traverse to correct page.
 	c.stack = c.stack[:0]
 	c.search(seek, c.bucket.root)
-	ref := &c.stack[len(c.stack)-1]
-
-	// If the cursor is pointing to the end of page/node then return nil.
-	if ref.index >= ref.count() {
-		return nil, nil, 0
-	}
 
 	// If this is a bucket then return a nil value.
 	return c.keyValue()
@@ -339,6 +333,8 @@ func (c *Cursor) nsearch(key []byte) {
 // keyValue returns the key and value of the current leaf element.
 func (c *Cursor) keyValue() ([]byte, []byte, uint32) {
 	ref := &c.stack[len(c.stack)-1]
+
+	// If the cursor is pointing to the end of page/node then return nil.
 	if ref.count() == 0 || ref.index >= ref.count() {
 		return nil, nil, 0
 	}
diff --git a/vendor/github.com/coreos/bbolt/db.go b/vendor/go.etcd.io/bbolt/db.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/db.go
rename to vendor/go.etcd.io/bbolt/db.go
index 4c8c156b2..4e38ab8c6 100644
--- a/vendor/github.com/coreos/bbolt/db.go
+++ b/vendor/go.etcd.io/bbolt/db.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"errors"
@@ -213,10 +213,13 @@ func Open(path string, mode os.FileMode, options *Options) (*DB, error) {
 
 	// Initialize the database if it doesn't exist.
 	if info, err := db.file.Stat(); err != nil {
+		_ = db.close()
 		return nil, err
 	} else if info.Size() == 0 {
 		// Initialize new files with meta pages.
 		if err := db.init(); err != nil {
+			// clean up file descriptor on initialization fail
+			_ = db.close()
 			return nil, err
 		}
 	} else {
@@ -236,6 +239,7 @@ func Open(path string, mode os.FileMode, options *Options) (*DB, error) {
 				db.pageSize = int(m.pageSize)
 			}
 		} else {
+			_ = db.close()
 			return nil, ErrInvalid
 		}
 	}
@@ -441,7 +445,8 @@ func (db *DB) init() error {
 }
 
 // Close releases all database resources.
-// All transactions must be closed before closing the database.
+// It will block waiting for any open transactions to finish
+// before closing the database and returning.
 func (db *DB) Close() error {
 	db.rwlock.Lock()
 	defer db.rwlock.Unlock()
@@ -449,8 +454,8 @@ func (db *DB) Close() error {
 	db.metalock.Lock()
 	defer db.metalock.Unlock()
 
-	db.mmaplock.RLock()
-	defer db.mmaplock.RUnlock()
+	db.mmaplock.Lock()
+	defer db.mmaplock.Unlock()
 
 	return db.close()
 }
diff --git a/vendor/github.com/coreos/bbolt/doc.go b/vendor/go.etcd.io/bbolt/doc.go
similarity index 94%
rename from vendor/github.com/coreos/bbolt/doc.go
rename to vendor/go.etcd.io/bbolt/doc.go
index cc937845d..95f25f01c 100644
--- a/vendor/github.com/coreos/bbolt/doc.go
+++ b/vendor/go.etcd.io/bbolt/doc.go
@@ -1,5 +1,5 @@
 /*
-Package bolt implements a low-level key/value store in pure Go. It supports
+package bbolt implements a low-level key/value store in pure Go. It supports
 fully serializable transactions, ACID semantics, and lock-free MVCC with
 multiple readers and a single writer. Bolt can be used for projects that
 want a simple data store without the need to add large dependencies such as
@@ -41,4 +41,4 @@ point to different data or can point to invalid memory which will cause a panic.
 
 
 */
-package bolt
+package bbolt
diff --git a/vendor/github.com/coreos/bbolt/errors.go b/vendor/go.etcd.io/bbolt/errors.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/errors.go
rename to vendor/go.etcd.io/bbolt/errors.go
index a3620a3eb..48758ca57 100644
--- a/vendor/github.com/coreos/bbolt/errors.go
+++ b/vendor/go.etcd.io/bbolt/errors.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import "errors"
 
diff --git a/vendor/github.com/coreos/bbolt/freelist.go b/vendor/go.etcd.io/bbolt/freelist.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/freelist.go
rename to vendor/go.etcd.io/bbolt/freelist.go
index 266f15429..e4bcb2dcf 100644
--- a/vendor/github.com/coreos/bbolt/freelist.go
+++ b/vendor/go.etcd.io/bbolt/freelist.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"fmt"
diff --git a/vendor/github.com/coreos/bbolt/node.go b/vendor/go.etcd.io/bbolt/node.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/node.go
rename to vendor/go.etcd.io/bbolt/node.go
index f4ce240ed..6c3fa553e 100644
--- a/vendor/github.com/coreos/bbolt/node.go
+++ b/vendor/go.etcd.io/bbolt/node.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"bytes"
diff --git a/vendor/github.com/coreos/bbolt/page.go b/vendor/go.etcd.io/bbolt/page.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/page.go
rename to vendor/go.etcd.io/bbolt/page.go
index cde403ae8..bca9615f0 100644
--- a/vendor/github.com/coreos/bbolt/page.go
+++ b/vendor/go.etcd.io/bbolt/page.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"fmt"
diff --git a/vendor/github.com/coreos/bbolt/tx.go b/vendor/go.etcd.io/bbolt/tx.go
similarity index 99%
rename from vendor/github.com/coreos/bbolt/tx.go
rename to vendor/go.etcd.io/bbolt/tx.go
index 5c0290733..f50864142 100644
--- a/vendor/github.com/coreos/bbolt/tx.go
+++ b/vendor/go.etcd.io/bbolt/tx.go
@@ -1,4 +1,4 @@
-package bolt
+package bbolt
 
 import (
 	"fmt"
@@ -303,7 +303,9 @@ func (tx *Tx) close() {
 }
 
 // Copy writes the entire database to a writer.
-// This function exists for backwards compatibility. Use WriteTo() instead.
+// This function exists for backwards compatibility.
+//
+// Deprecated; Use WriteTo() instead.
 func (tx *Tx) Copy(w io.Writer) error {
 	_, err := tx.WriteTo(w)
 	return err