Merge branch 'master' into user/jirenugo/keysvc

Author: jirenugo

go.mod

@@ -6,7 +6,7 @@ require (
 	code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48
 	github.com/golang/protobuf v1.5.4
 	github.com/google/go-cmp v0.6.0
-	github.com/microsoft/moc v0.25.4
+	github.com/microsoft/moc v0.25.5
 	github.com/spf13/viper v1.15.0
 	github.com/stretchr/testify v1.9.0
 	go.opencensus.io v0.24.0

go.sum

@@ -162,8 +162,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/microsoft/moc v0.25.4 h1:J6Rpa0TSQbH1QDTtoveEVhQ9KHevgsty0r4tQ1QdVdc=
-github.com/microsoft/moc v0.25.4/go.mod h1:PwmwdbVF3n8fnCJloNgyck+/XvgPjqdXMTrzNzkH+u0=
+github.com/microsoft/moc v0.25.5 h1:ZusF4O/+yzPkjeaCBQO5v/eSofxQtDoUmrPqOmq7HwE=
+github.com/microsoft/moc v0.25.5/go.mod h1:Imw1xly6vIx3htE3vQ8dvfUoK91XULa0KBLkvq6CJPk=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=