Updates to grpc gateway stuff to match latest master
Updates to grpc gateway stuff to match latest master

thought-machine/pleasings,thought-machine/pleasings,thought-machine/pleasings,thought-machine/pleasings,thought-machine/pleasings,thought-machine/pleasings,thought-machine/pleasings,thought-machine/pleasings,thought-machine/pleasings,thought-machine/pleasings