Merge pull request #4510 from mbargo23/luci-gre