clang-6/gcc: compiler barking fix#2123

duderino merged 2 commits intoistio:release-1.1istio/proxy:release-1.1from

kyessenov:clang-fixkyessenov/proxy:clang-fixCopy head branch name to clipboard