Alexander Belanger ff3cc08729 fix merge conflicts 4 gadi atpakaļ
..
helpers_test.go ff3cc08729 fix merge conflicts 4 gadi atpakaļ
rotate.go 4e39df7def add migration option for vault 4 gadi atpakaļ
rotate_test.go 4e39df7def add migration option for vault 4 gadi atpakaļ