Merge "v.io/jiri: tidying up utilities routines"