Merge pull request #6025 from jempatel/luci-proto-vti