chore: Move back to upstream for umoci import, go mod tidy (#512)

chore: Move back to upstream for umoci import, go mod tidy (#512) #1091