Merge branch '3551-go-layout'
drwxr-xr-x - git
drwxr-xr-x - jenkins