CBIT-532:  fix go flags

Change-Id: If01a80fcd1be2afd3681262527a4163455bb1665