needed fixes, as well as the support for go1.8.x Signed-off-by: Darren Stahl <darst@microsoft.com> Upstream-commit: 9c32a9d1b7 Component: cli
9c32a9d1b7